From f618f914cd9d85ffba506e64c4a2cf998f10e465 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Mon, 1 Oct 2012 15:43:19 +0200
Subject: Use win-iconv for Fontconfig

---
 win32/deps/fontconfig/config.h           | 2 +-
 win32/deps/fontconfig/fontconfig.vcxproj | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'win32')

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>
-- 
cgit 1.4.1