diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 10:01:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 10:01:58 +0100 |
| commit | 11e66a9a49dacd4e1a88348ff1a3270f0090eca8 (patch) | |
| tree | 167b3038e84297e0052ce4462565aea0df2ffef9 | |
| parent | 20f1b1163feb0d87091bd9e384a921a6ce9c1fde (diff) | |
| download | vcxsrv-11e66a9a49dacd4e1a88348ff1a3270f0090eca8.tar.gz vcxsrv-11e66a9a49dacd4e1a88348ff1a3270f0090eca8.tar.bz2 vcxsrv-11e66a9a49dacd4e1a88348ff1a3270f0090eca8.zip | |
Updated version of freetype in makefiles and project files
| -rw-r--r-- | apps/xclock/makefile | 4 | ||||
| -rw-r--r-- | freetype/freetype.vcxproj | 12 | ||||
| -rw-r--r-- | mkfontscale/makefile | 4 | ||||
| -rw-r--r-- | xkbcomp/makefile | 4 | ||||
| -rw-r--r-- | xorg-server/makefile | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/apps/xclock/makefile b/apps/xclock/makefile index bc89baee9..83c79b95e 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\freetype2410MT_D.lib + $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib else LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \ - $(MHMAKECONF)\freetype\lib\freetype2410MT.lib + $(MHMAKECONF)\freetype\lib\freetype2411MT.lib endif LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index 3245c3a70..1ec353da4 100644 --- a/freetype/freetype.vcxproj +++ b/freetype/freetype.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Multithreaded|Win32">
@@ -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'">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>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype2411MT_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype2411MT</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype2411_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype2411</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -384,4 +384,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/mkfontscale/makefile b/mkfontscale/makefile index fc4b5a7b7..96da0960a 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -20,9 +20,9 @@ CSRCS = hash.c \ mkfontscale.c ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT_D.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT.lib endif diff --git a/xkbcomp/makefile b/xkbcomp/makefile index b2e770861..35e626587 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\freetype2410MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2410MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2411MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif diff --git a/xorg-server/makefile b/xorg-server/makefile index d5f9c5b6f..caaa12029 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\freetype2410MT_D.lib \ + $(MHMAKECONF)\freetype\lib\freetype2411MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else @@ -64,7 +64,7 @@ WINAPP=vcxsrv APP:=$(WINAPP) LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \ - $(MHMAKECONF)\freetype\lib\freetype2410MT.lib \ + $(MHMAKECONF)\freetype\lib\freetype2411MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif |