From bd3f028ee17494c5ff2c92ff0a2eaa6220da61a6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 6 Aug 2010 12:04:09 +0000
Subject: Solved freetype compilation problems

---
 freetype/freetype.vcproj    | 8 ++++----
 freetype/freetype.vcxproj   | 8 ++++----
 freetype/src/cff/cfftypes.h | 6 +++---
 mkfontscale/makefile        | 4 ++--
 xkbcomp/makefile            | 4 ++--
 xorg-server/makefile        | 4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/freetype/freetype.vcproj b/freetype/freetype.vcproj
index 09b2bbfec..74fbbbd1e 100644
--- a/freetype/freetype.vcproj
+++ b/freetype/freetype.vcproj
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/freetype200b8.lib"
+				OutputFile="$(OutDir)/freetype214.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/freetype200b8MT.lib"
+				OutputFile="$(OutDir)/freetype214MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -218,7 +218,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/freetype200b8_D.lib"
+				OutputFile="$(OutDir)/freetype214_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/freetype200b8MT_D.lib"
+				OutputFile="$(OutDir)/freetype214MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index fcec6202f..445ea86f8 100644
--- a/freetype/freetype.vcxproj
+++ b/freetype/freetype.vcxproj
@@ -73,10 +73,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">objs/debug\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">objs/debug_mt\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype200b8MT_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype200b8MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype200b8_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype200b8</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype241MT_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype241MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype241_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype241</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
diff --git a/freetype/src/cff/cfftypes.h b/freetype/src/cff/cfftypes.h
index 9725c542a..4dc78a51e 100644
--- a/freetype/src/cff/cfftypes.h
+++ b/freetype/src/cff/cfftypes.h
@@ -24,9 +24,9 @@
 #include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
-#include FT_INTERNAL_SERVICE_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
+#include <freetype/internal/ftserv.h>
+#include <freetype/internal/services/svpscmap.h>
+#include <freetype/internal/pshints.h>
 
 
 FT_BEGIN_HEADER
diff --git a/mkfontscale/makefile b/mkfontscale/makefile
index a8e1e9a8f..c7f922cb5 100644
--- a/mkfontscale/makefile
+++ b/mkfontscale/makefile
@@ -20,9 +20,9 @@ CSRCS = hash.c \
 	mkfontscale.c
 
 ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib
 else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT.lib
 endif
 
 
diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index 63fff1928..9f27c83d9 100644
--- a/xkbcomp/makefile
+++ b/xkbcomp/makefile
@@ -46,10 +46,10 @@ CSRCS = action.c \
 LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib
 
 ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2d.lib
 else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2.lib
 endif
 
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 3c9f767d1..e53b5b2fb 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -59,7 +59,7 @@ TTYAPP=vcxsrv_dbg
 APP:=$(TTYAPP)
 
 LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
-            $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \
+            $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2d.lib
 
 $(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
@@ -69,7 +69,7 @@ WINAPP=vcxsrv
 APP:=$(WINAPP)
 
 LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
-            $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \
+            $(MHMAKECONF)\freetype\lib\freetype214MT.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2.lib
 
 endif
-- 
cgit v1.2.3