aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-18 15:43:28 +0100
committermarha <marha@users.sourceforge.net>2011-11-18 15:43:28 +0100
commit8fa2e6f994cfbcba4640ec157f0a55b706207976 (patch)
tree62e55ec697bf24a5fb3fa40b1724d8a5cb17ef4d
parentac36cb2c0db123b18d83f59d011d83b299edea63 (diff)
downloadvcxsrv-8fa2e6f994cfbcba4640ec157f0a55b706207976.tar.gz
vcxsrv-8fa2e6f994cfbcba4640ec157f0a55b706207976.tar.bz2
vcxsrv-8fa2e6f994cfbcba4640ec157f0a55b706207976.zip
Updated makefile with new version of freetype
-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 ac51a0744..876ee9fc0 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\freetype247MT_D.lib
+ $(MHMAKECONF)\freetype\lib\freetype248MT_D.lib
else
LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \
- $(MHMAKECONF)\freetype\lib\freetype247MT.lib
+ $(MHMAKECONF)\freetype\lib\freetype248MT.lib
endif
LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 0f10862fe..3dc16a498 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'">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>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype248MT_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype248MT</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype248_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype248</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
diff --git a/mkfontscale/makefile b/mkfontscale/makefile
index 4410a583f..3e66c1e79 100644
--- a/mkfontscale/makefile
+++ b/mkfontscale/makefile
@@ -20,9 +20,9 @@ CSRCS = hash.c \
mkfontscale.c
ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT_D.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT_D.lib
else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT.lib
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT.lib
endif
diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index cc9bdd6d3..0f5600916 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\freetype247MT_D.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT_D.lib \
$(MHMAKECONF)\pthreads\pthreadVC2d.lib
else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype247MT.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
endif
diff --git a/xorg-server/makefile b/xorg-server/makefile
index e75d48326..9b3bdbc9c 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\freetype247MT_D.lib \
+ $(MHMAKECONF)\freetype\lib\freetype248MT_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\freetype247MT.lib \
+ $(MHMAKECONF)\freetype\lib\freetype248MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
endif