From 69aec3395435c636dea14ad5e893a0ceeb47baa8 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 21 Jun 2013 12:38:57 +0200 Subject: Use freetype 2.5.1 library in makefile --- apps/xclock/makefile | 4 ++-- mkfontscale/makefile | 4 ++-- xkbcomp/makefile | 4 ++-- xorg-server/makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/xclock/makefile b/apps/xclock/makefile index 83c79b95e..d1ec788c6 100644 --- a/apps/xclock/makefile +++ b/apps/xclock/makefile @@ -25,10 +25,10 @@ load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) ifeq ($(DEBUG),1) LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib \ - $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib + $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib else LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \ - $(MHMAKECONF)\freetype\lib\freetype2411MT.lib + $(MHMAKECONF)\freetype\lib\freetype2501MT.lib endif LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib diff --git a/mkfontscale/makefile b/mkfontscale/makefile index 96da0960a..2d7556d31 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -20,9 +20,9 @@ CSRCS = hash.c \ mkfontscale.c ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2501MT.lib endif diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 35e626587..f495b9c03 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -40,10 +40,10 @@ CSRCS = action.c \ LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2501MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif diff --git a/xorg-server/makefile b/xorg-server/makefile index 5e31c21d3..02c2d3e86 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -56,7 +56,7 @@ TTYAPP=vcxsrv APP:=$(TTYAPP) LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \ - $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib \ + $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else @@ -64,7 +64,7 @@ WINAPP=vcxsrv APP:=$(WINAPP) LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \ - $(MHMAKECONF)\freetype\lib\freetype2411MT.lib \ + $(MHMAKECONF)\freetype\lib\freetype2501MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif -- cgit v1.2.3