From 369603df0452765724d3b53cd77a9f4bf3809fa1 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 15 Jun 2012 15:01:36 +0200
Subject: Freetype library name changed

---
 apps/xclock/makefile      | 4 ++--
 freetype/freetype.vcxproj | 8 ++++----
 mkfontscale/makefile      | 4 ++--
 xkbcomp/makefile          | 4 ++--
 xorg-server/makefile      | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/xclock/makefile b/apps/xclock/makefile
index a3b763ac7..99a8c4c81 100644
--- a/apps/xclock/makefile
+++ b/apps/xclock/makefile
@@ -34,10 +34,10 @@ load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
 
 ifeq ($(DEBUG),1)
 LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib \
-            $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib
+            $(MHMAKECONF)\freetype\lib\freetype2410MT_D.lib
 else
 LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \
-            $(MHMAKECONF)\freetype\lib\freetype249MT.lib
+            $(MHMAKECONF)\freetype\lib\freetype2410MT.lib
 endif
 
 LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 8a3d650e2..3245c3a70 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'">freetype249MT_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype249MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype249_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype249</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype2410MT_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype2410MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype2410_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype2410</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
diff --git a/mkfontscale/makefile b/mkfontscale/makefile
index 250137074..be789d4df 100644
--- a/mkfontscale/makefile
+++ b/mkfontscale/makefile
@@ -20,9 +20,9 @@ CSRCS = hash.c \
 	mkfontscale.c
 
 ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT_D.lib
 else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT.lib
 endif
 
 
diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index 815ac920d..298d795a6 100644
--- a/xkbcomp/makefile
+++ b/xkbcomp/makefile
@@ -48,10 +48,10 @@ CSRCS = action.c \
 LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib
 
 ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT_D.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2d.lib
 else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2.lib
 endif
 
diff --git a/xorg-server/makefile b/xorg-server/makefile
index aed6bda3a..6cb0ee817 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -61,7 +61,7 @@ TTYAPP=vcxsrv_dbg
 APP:=$(TTYAPP)
 
 LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
-            $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib \
+            $(MHMAKECONF)\freetype\lib\freetype2410MT_D.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2d.lib
 
 $(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
@@ -71,7 +71,7 @@ WINAPP=vcxsrv
 APP:=$(WINAPP)
 
 LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
-            $(MHMAKECONF)\freetype\lib\freetype249MT.lib \
+            $(MHMAKECONF)\freetype\lib\freetype2410MT.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2.lib
 
 endif
-- 
cgit v1.2.3