aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/makefile
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 14:29:10 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 14:29:10 +0000
commitddfb922180a6a847d52609592a2bdb37179ca439 (patch)
tree7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /xorg-server/makefile
parent02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff)
parent2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff)
downloadvcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.gz
vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.bz2
vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Gives currently link errors. xorg-server needs to be upgraded to.
Diffstat (limited to 'xorg-server/makefile')
-rw-r--r--xorg-server/makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index e9ba83e98..d1c758e09 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -48,9 +48,7 @@ INCLUDELIBFILES = afb\$(OBJDIR)\libafb.lib \
$(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \
$(MHMAKECONF)\zlib\$(OBJDIR)\libz.lib \
$(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
- $(MHMAKECONF)\libXfont\src\Type1\$(OBJDIR)\libtype1.lib \
$(MHMAKECONF)\libfontenc\src\$(OBJDIR)\libfontenc.lib \
- $(MHMAKECONF)\libXfont\src\Speedo\$(OBJDIR)\libspeedo.lib \
$(MHMAKECONF)\libxfont\src\freetype\$(OBJDIR)\libft.lib \
$(MHMAKECONF)\libxfont\src\stubs\$(OBJDIR)\libstubs.lib