From 0256e696cc3b22f3eb105ab63fd3cce24cd21b2f Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 18 Jul 2011 10:59:45 +0200 Subject: freetype244 -> freetype245 --- 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 5fc515236..e158af57b 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\freetype244MT_D.lib + $(MHMAKECONF)\freetype\lib\freetype245MT_D.lib else LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \ - $(MHMAKECONF)\freetype\lib\freetype244MT.lib + $(MHMAKECONF)\freetype\lib\freetype245MT.lib endif LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index 221c924bd..76d8f1e28 100644 --- a/freetype/freetype.vcxproj +++ b/freetype/freetype.vcxproj @@ -73,10 +73,10 @@ objs/debug\ lib\ objs/debug_mt\ - freetype244MT_D - freetype244MT - freetype244_D - freetype244 + freetype245MT_D + freetype245MT + freetype245_D + freetype245 diff --git a/mkfontscale/makefile b/mkfontscale/makefile index 1f58b9e22..71598b17e 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -20,9 +20,9 @@ CSRCS = hash.c \ mkfontscale.c ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype244MT_D.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT_D.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype244MT.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT.lib endif diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 68e35a80a..aa99e55e1 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\freetype244MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype244MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif diff --git a/xorg-server/makefile b/xorg-server/makefile index bd2572eed..81baf2723 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\freetype244MT_D.lib \ + $(MHMAKECONF)\freetype\lib\freetype245MT_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\freetype244MT.lib \ + $(MHMAKECONF)\freetype\lib\freetype245MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif -- cgit v1.2.3