Fix compilation error on unix when using internal libass

Originally committed to SVN as r4848.
2010-11-18 04:31:38 +00:00 · 2010-11-18 04:31:38 +00:00 · c571f64f86
parent ea5a042046
commit c571f64f86
2 changed files with 3 additions and 2 deletions
--- a/aegisub/build/libass_vs2008/libass_vs2008.vcproj
+++ b/aegisub/build/libass_vs2008/libass_vs2008.vcproj
@ -253,7 +253,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libass\msvc\config.h"
+				RelativePath="..\..\libass\config.h"
 				>
 			</File>
 		</Filter>
--- a/aegisub/libass/msvc/config.h
+++ b/aegisub/libass/msvc/config.h
@ -1,4 +1,4 @@
-//#define CONFIG_ENCA 1
+#ifdef _MSVC
 #define CONFIG_FONTCONFIG 1
 #define CONFIG_ICONV 1

@ -7,3 +7,4 @@
 #define strtoll(p, e, b) _strtoi64(p, e, b)

 #define M_PI 3.1415926535897932384626433832795
+#endif