aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-10 16:23:43 +0100
committermarha <marha@users.sourceforge.net>2011-11-10 16:23:43 +0100
commit00ea126522f5bbf5c4600ddb93a45b260475c8c1 (patch)
treed0b7237bc9c47efe2e4366239bc6676220e51da8
parent82e62cfbf79bc8c19946d034a0d5e14ce4fabb44 (diff)
downloadvcxsrv-00ea126522f5bbf5c4600ddb93a45b260475c8c1.tar.gz
vcxsrv-00ea126522f5bbf5c4600ddb93a45b260475c8c1.tar.bz2
vcxsrv-00ea126522f5bbf5c4600ddb93a45b260475c8c1.zip
Freetype changed version to 2.4.7 in makefiles
-rw-r--r--apps/xclock/makefile4
-rw-r--r--freetype/freetype.vcxproj8
-rw-r--r--mkfontscale/makefile4
-rw-r--r--xkbcomp/makefile4
-rw-r--r--xorg-server/makefile4
5 files changed, 12 insertions, 12 deletions
diff --git a/apps/xclock/makefile b/apps/xclock/makefile
index 56785a808..ac51a0744 100644
--- a/apps/xclock/makefile
+++ b/apps/xclock/makefile
@@ -34,10 +34,10 @@ load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(D
ifeq ($(DEBUG),1)
LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib \
- $(MHMAKECONF)\freetype\lib\freetype246MT_D.lib
+ $(MHMAKECONF)\freetype\lib\freetype247MT_D.lib
else
LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \
- $(MHMAKECONF)\freetype\lib\freetype246MT.lib
+ $(MHMAKECONF)\freetype\lib\freetype247MT.lib
endif
LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 942f9e9b8..0f10862fe 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'">freetype246MT_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype246MT</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype246_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype246</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype247MT_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype247MT</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype247_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype247</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
diff --git a/mkfontscale/makefile b/mkfontscale/makefile
index fcc40dc43..4410a583f 100644
--- a/mkfontscale/makefile
+++ b/mkfontscale/makefile
@@ -20,9 +20,9 @@ CSRCS = hash.c \
mkfontscale.c
ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT_D.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT_D.lib
else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT.lib
endif
diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index d62d22669..cc9bdd6d3 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\freetype246MT_D.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT_D.lib \
$(MHMAKECONF)\pthreads\pthreadVC2d.lib
else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
endif
diff --git a/xorg-server/makefile b/xorg-server/makefile
index fe797e721..e75d48326 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\freetype246MT_D.lib \
+ $(MHMAKECONF)\freetype\lib\freetype247MT_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\freetype246MT.lib \
+ $(MHMAKECONF)\freetype\lib\freetype247MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
endif