diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 10:53:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:53:14 +0100 |
| commit | 2b6ab5ff6c32e8bda9f50e38d12367502d3dd32c (patch) | |
| tree | 26acf0b08db9ba7570925091d559ed7380cd4894 | |
| parent | 485b633824020c557eb60258e1d36975c8c44770 (diff) | |
| download | vcxsrv-2b6ab5ff6c32e8bda9f50e38d12367502d3dd32c.tar.gz vcxsrv-2b6ab5ff6c32e8bda9f50e38d12367502d3dd32c.tar.bz2 vcxsrv-2b6ab5ff6c32e8bda9f50e38d12367502d3dd32c.zip | |
Updated libraries in makefile for freetype249
| -rw-r--r-- | apps/xclock/makefile | 4 | ||||
| -rw-r--r-- | freetype/freetype.vcxproj | 8 | ||||
| -rw-r--r-- | mkfontscale/makefile | 4 | ||||
| -rw-r--r-- | xkbcomp/makefile | 4 | ||||
| -rw-r--r-- | xorg-server/makefile | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/apps/xclock/makefile b/apps/xclock/makefile index d4a0ff4c3..a3b763ac7 100644 --- a/apps/xclock/makefile +++ b/apps/xclock/makefile @@ -34,10 +34,10 @@ load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) ifeq ($(DEBUG),1) LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib \ - $(MHMAKECONF)\freetype\lib\freetype248MT_D.lib + $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib else LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \ - $(MHMAKECONF)\freetype\lib\freetype248MT.lib + $(MHMAKECONF)\freetype\lib\freetype249MT.lib endif LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index ba9dfc34b..8a3d650e2 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'">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>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype249MT_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype249MT</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype249_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype249</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
diff --git a/mkfontscale/makefile b/mkfontscale/makefile index 3e66c1e79..250137074 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -20,9 +20,9 @@ CSRCS = hash.c \ mkfontscale.c ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT_D.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT.lib endif diff --git a/xkbcomp/makefile b/xkbcomp/makefile index a02e67396..815ac920d 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\freetype248MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype248MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype249MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif diff --git a/xorg-server/makefile b/xorg-server/makefile index 4a3a7f201..aed6bda3a 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\freetype248MT_D.lib \ + $(MHMAKECONF)\freetype\lib\freetype249MT_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\freetype248MT.lib \ + $(MHMAKECONF)\freetype\lib\freetype249MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif |