aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-20 08:28:36 +0000
committermarha <marha@users.sourceforge.net>2010-08-20 08:28:36 +0000
commitf5d6fd32902e742cc62622b1abc8826dd7c03c32 (patch)
tree96c33069543f425f5f70045e24b549a5783c73d1 /xorg-server
parent3799f1085abb02c5721f4c33f42c063edb68029d (diff)
parent00666832a756014eef48c4f5bd8484cc1299bdf0 (diff)
downloadvcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.gz
vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.bz2
vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.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 d1215d29c..af33a26dc 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -59,7 +59,7 @@ TTYAPP=vcxsrv_dbg
APP:=$(TTYAPP)
LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
- $(MHMAKECONF)\freetype\lib\freetype241MT_D.lib \
+ $(MHMAKECONF)\freetype\lib\freetype242MT_D.lib \
$(MHMAKECONF)\pthreads\pthreadVC2d.lib
$(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
@@ -69,7 +69,7 @@ WINAPP=vcxsrv
APP:=$(WINAPP)
LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
- $(MHMAKECONF)\freetype\lib\freetype241MT.lib \
+ $(MHMAKECONF)\freetype\lib\freetype242MT.lib \
$(MHMAKECONF)\pthreads\pthreadVC2.lib
endif