aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-16 19:26:40 +0000
committermarha <marha@users.sourceforge.net>2011-01-16 19:26:40 +0000
commit4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch)
tree543c693b5dee03c965b0c9ef79869a8536024432 /xorg-server
parent1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff)
parent2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff)
downloadvcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz
vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2
vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 44ccdba03..be5748d3f 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -60,7 +60,7 @@ TTYAPP=vcxsrv_dbg
APP:=$(TTYAPP)
LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
- $(MHMAKECONF)\freetype\lib\freetype242MT_D.lib \
+ $(MHMAKECONF)\freetype\lib\freetype244MT_D.lib \
$(MHMAKECONF)\pthreads\pthreadVC2d.lib
$(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
@@ -70,7 +70,7 @@ WINAPP=vcxsrv
APP:=$(WINAPP)
LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
- $(MHMAKECONF)\freetype\lib\freetype242MT.lib \
+ $(MHMAKECONF)\freetype\lib\freetype244MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
endif