From 70440a8874feb0e0ffee2e6dd0cbcbc0f65f0fa0 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 12 Dec 2013 10:19:38 -0800
Subject: [PATCH] Switch to unpatched libass since it's compilable with VC++
 2013

---
 .gitmodules                         | 4 ++--
 aegisub/build/libass/config.h       | 7 +++++++
 aegisub/build/libass/libass.vcxproj | 4 ++--
 aegisub/build/libass/strings.h      | 3 +++
 aegisub/build/libass/unistd.h       | 0
 deps/libass                         | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 aegisub/build/libass/config.h
 create mode 100644 aegisub/build/libass/strings.h
 create mode 100644 aegisub/build/libass/unistd.h

diff --git a/.gitmodules b/.gitmodules
index 920a5226d..2bb6ab813 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,8 +34,8 @@
 	ignore = dirty
 [submodule "deps/libass"]
 	path = deps/libass
-	url = https://github.com/Aegisub/libass.git
-	branch = msvc
+	url = https://code.google.com/p/libass/
+	branch = master
 [submodule "deps/icu"]
 	path = deps/icu
 	url = git://github.com/sillsdev/icu4c.git
diff --git a/aegisub/build/libass/config.h b/aegisub/build/libass/config.h
new file mode 100644
index 000000000..8309fa852
--- /dev/null
+++ b/aegisub/build/libass/config.h
@@ -0,0 +1,7 @@
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+
+#define CONFIG_FONTCONFIG 1
+#define CONFIG_ICONV 1
+
+#define M_PI 3.1415926535897932384626433832795
diff --git a/aegisub/build/libass/libass.vcxproj b/aegisub/build/libass/libass.vcxproj
index 98bc323ca..23b78747a 100644
--- a/aegisub/build/libass/libass.vcxproj
+++ b/aegisub/build/libass/libass.vcxproj
@@ -19,8 +19,8 @@
     <ClCompile>
       <AdditionalIncludeDirectories>
         $(LibassSrcDir)\libass;
-        $(LibassSrcDir)\win32;
-        $(LibassSrcDir)\win32\headers;
+        $(MSBuildThisFileDirectory);
+        $(AegisubSourceBase)\include\fribidi;
         $(AegisubContribBase)iconv\include;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
diff --git a/aegisub/build/libass/strings.h b/aegisub/build/libass/strings.h
new file mode 100644
index 000000000..8279fd78d
--- /dev/null
+++ b/aegisub/build/libass/strings.h
@@ -0,0 +1,3 @@
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+
diff --git a/aegisub/build/libass/unistd.h b/aegisub/build/libass/unistd.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/deps/libass b/deps/libass
index a39459972..de3f0e757 160000
--- a/deps/libass
+++ b/deps/libass
@@ -1 +1 @@
-Subproject commit a394599720fb6c8f8ac821351f9851da82ce4e11
+Subproject commit de3f0e7572fb927d10857d4177ef58be2c9b3dbc