diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-10-01 15:43:19 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-10-01 15:43:19 +0200 |
| commit | f618f914cd9d85ffba506e64c4a2cf998f10e465 (patch) | |
| tree | aa141d330eb322cdf10c791301db73e511c9b5d8 | |
| parent | 5a5c1798aa928863bc7f5e0a48d2051ec14c144b (diff) | |
Use win-iconv for Fontconfig
| -rw-r--r-- | win32/deps/fontconfig/config.h | 2 | ||||
| -rw-r--r-- | win32/deps/fontconfig/fontconfig.vcxproj | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/win32/deps/fontconfig/config.h b/win32/deps/fontconfig/config.h index 7afabb3d..c66dd904 100644 --- a/win32/deps/fontconfig/config.h +++ b/win32/deps/fontconfig/config.h @@ -219,7 +219,7 @@ #define STDC_HEADERS 1 /* Use iconv. */ -/*#define USE_ICONV 1*/ +#define USE_ICONV 1 /* Version number of package */ #define VERSION "2.7.3" diff --git a/win32/deps/fontconfig/fontconfig.vcxproj b/win32/deps/fontconfig/fontconfig.vcxproj index 872d371a..0c22bced 100644 --- a/win32/deps/fontconfig/fontconfig.vcxproj +++ b/win32/deps/fontconfig/fontconfig.vcxproj @@ -166,7 +166,7 @@ <DisableSpecificWarnings>4244;4819;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>libxml2.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libxml2.lib;iconv.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)fontconfig.dll</OutputFile> <AdditionalLibraryDirectories>..\vs9\$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>fontconfig.def</ModuleDefinitionFile> @@ -199,7 +199,7 @@ <DisableSpecificWarnings>4244;4819;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>libxml2.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libxml2.lib;iconv.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)fontconfig.dll</OutputFile> <AdditionalLibraryDirectories>..\vs9\$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>fontconfig.def</ModuleDefinitionFile> |