From c571f64f869b124ddaf9995f3ed01f2f9596bb1d Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 18 Nov 2010 04:31:38 +0000
Subject: [PATCH] Fix compilation error on unix when using internal libass

Originally committed to SVN as r4848.
---
 aegisub/build/libass_vs2008/libass_vs2008.vcproj | 2 +-
 aegisub/libass/{msvc => }/config.h               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename aegisub/libass/{msvc => }/config.h (87%)

diff --git a/aegisub/build/libass_vs2008/libass_vs2008.vcproj b/aegisub/build/libass_vs2008/libass_vs2008.vcproj
index 6a18adc38..0e596c203 100644
--- 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>
diff --git a/aegisub/libass/msvc/config.h b/aegisub/libass/config.h
similarity index 87%
rename from aegisub/libass/msvc/config.h
rename to aegisub/libass/config.h
index 1a6b91f90..4834bcd3a 100644
--- a/aegisub/libass/msvc/config.h
+++ b/aegisub/libass/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