SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use win-iconv for Fontconfig

This commit is contained in:
Berke Viktor 2012-10-01 15:43:19 +02:00
parent 5a5c1798aa
commit f618f914cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
win32/deps/fontconfig/config.h
View File

@ -219,7 +219,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Use iconv. */ /* Use iconv. */
/*#define USE_ICONV 1*/ #define USE_ICONV 1
/* Version number of package */ /* Version number of package */
#define VERSION "2.7.3" #define VERSION "2.7.3"

4
win32/deps/fontconfig/fontconfig.vcxproj
View File

@ -166,7 +166,7 @@
<DisableSpecificWarnings>4244;4819;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4244;4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>libxml2.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libxml2.lib;iconv.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)fontconfig.dll</OutputFile> <OutputFile>$(OutDir)fontconfig.dll</OutputFile>
<AdditionalLibraryDirectories>..\vs9\$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\vs9\$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>fontconfig.def</ModuleDefinitionFile> <ModuleDefinitionFile>fontconfig.def</ModuleDefinitionFile>
@ -199,7 +199,7 @@
<DisableSpecificWarnings>4244;4819;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4244;4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>libxml2.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libxml2.lib;iconv.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)fontconfig.dll</OutputFile> <OutputFile>$(OutDir)fontconfig.dll</OutputFile>
<AdditionalLibraryDirectories>..\vs9\$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\vs9\$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>fontconfig.def</ModuleDefinitionFile> <ModuleDefinitionFile>fontconfig.def</ModuleDefinitionFile>