Switch to unpatched libass since it's compilable with VC++ 2013

This commit is contained in:
Thomas Goyne 2013-12-12 10:19:38 -08:00
parent be485dd4d4
commit 70440a8874
6 changed files with 15 additions and 5 deletions

4
.gitmodules vendored
View file

@ -34,8 +34,8 @@
ignore = dirty ignore = dirty
[submodule "deps/libass"] [submodule "deps/libass"]
path = deps/libass path = deps/libass
url = https://github.com/Aegisub/libass.git url = https://code.google.com/p/libass/
branch = msvc branch = master
[submodule "deps/icu"] [submodule "deps/icu"]
path = deps/icu path = deps/icu
url = git://github.com/sillsdev/icu4c.git url = git://github.com/sillsdev/icu4c.git

View file

@ -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

View file

@ -19,8 +19,8 @@
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
$(LibassSrcDir)\libass; $(LibassSrcDir)\libass;
$(LibassSrcDir)\win32; $(MSBuildThisFileDirectory);
$(LibassSrcDir)\win32\headers; $(AegisubSourceBase)\include\fribidi;
$(AegisubContribBase)iconv\include; $(AegisubContribBase)iconv\include;
%(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>

View file

@ -0,0 +1,3 @@
#define strncasecmp _strnicmp
#define strcasecmp _stricmp

View file

2
deps/libass vendored

@ -1 +1 @@
Subproject commit a394599720fb6c8f8ac821351f9851da82ce4e11 Subproject commit de3f0e7572fb927d10857d4177ef58be2c9b3dbc