diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 10:24:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 10:24:27 +0200 |
| commit | b62a8282d83a3a1fae97c5022a150d11de87597a (patch) | |
| tree | bb0a4aba238926bb11c06a682b9d161518bc235b | |
| parent | 9441c8f47bb24faebc885bfc3c5e37f47a3ad984 (diff) | |
| download | vcxsrv-b62a8282d83a3a1fae97c5022a150d11de87597a.tar.gz vcxsrv-b62a8282d83a3a1fae97c5022a150d11de87597a.tar.bz2 vcxsrv-b62a8282d83a3a1fae97c5022a150d11de87597a.zip | |
Updated version of freetype in makefiles
| -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 e158af57b..3d3971cd1 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\freetype245MT_D.lib + $(MHMAKECONF)\freetype\lib\freetype246MT_D.lib else LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \ - $(MHMAKECONF)\freetype\lib\freetype245MT.lib + $(MHMAKECONF)\freetype\lib\freetype246MT.lib endif LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index 76d8f1e28..911c969ae 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'">freetype245MT_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype245MT</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype245_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype245</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype246MT_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype246MT</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype246_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype246</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
diff --git a/mkfontscale/makefile b/mkfontscale/makefile index 71598b17e..fcc40dc43 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -20,9 +20,9 @@ CSRCS = hash.c \ mkfontscale.c ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT_D.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT_D.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT.lib endif diff --git a/xkbcomp/makefile b/xkbcomp/makefile index aa99e55e1..d62d22669 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\freetype245MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype245MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype246MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif diff --git a/xorg-server/makefile b/xorg-server/makefile index 81baf2723..4010d07f8 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\freetype245MT_D.lib \ + $(MHMAKECONF)\freetype\lib\freetype246MT_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\freetype245MT.lib \ + $(MHMAKECONF)\freetype\lib\freetype246MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif |