diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
commit | ddfb922180a6a847d52609592a2bdb37179ca439 (patch) | |
tree | 7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /libXfont/src/fontfile/makefile | |
parent | 02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff) | |
parent | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff) | |
download | vcxsrv-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 'libXfont/src/fontfile/makefile')
-rw-r--r-- | libXfont/src/fontfile/makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libXfont/src/fontfile/makefile b/libXfont/src/fontfile/makefile index 019c87802..12e289d30 100644 --- a/libXfont/src/fontfile/makefile +++ b/libXfont/src/fontfile/makefile @@ -1,11 +1,8 @@ -#FONTENCDIR=@ENCODINGSDIR@ -#FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\" LIBRARY = libfontfile INCLUDES += $(MHMAKECONF)\zlib\src\zlib-1.2.3 -#DEFINES += XFONT_TYPE1 XFONT_SPEEDO XFONT_BITMAP XFONT_FREETYPE BUILD_SPEEDO BUILD_TYPE1 BUILD_FREETYPE X_GZIP_FONT_COMPRESSION DEFINES += X_GZIP_FONT_COMPRESSION CSRCS = bitsource.c \ @@ -13,7 +10,6 @@ CSRCS = bitsource.c \ decompress.c \ defaults.c \ dirfile.c \ - ffcheck.c \ fileio.c \ filewr.c \ fontdir.c \ @@ -21,13 +17,9 @@ CSRCS = bitsource.c \ fontfile.c \ fontscale.c \ gunzip.c \ - printerfont.c \ register.c \ renderers.c \ catalogue.c -#if X_BZIP2_FONT_COMPRESSION -#libfontfile_la_SOURCES += bunzip2.c -#endif INCLUDES := ../../../../build $(INCLUDES) |