diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
| commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
| tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /fontconfig/src/makefile | |
| parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
| parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
| download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'fontconfig/src/makefile')
| -rw-r--r-- | fontconfig/src/makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile index a289c5f6e..091584172 100644 --- a/fontconfig/src/makefile +++ b/fontconfig/src/makefile @@ -1,14 +1,4 @@ -#INCLUDES = \ -# -I$(top_srcdir) \ -# -I$(top_srcdir)/src \ -# $(FREETYPE_CFLAGS) \ -# $(LIBXML2_CFLAGS) \ -# $(EXPAT_CFLAGS) \ -# $(WARN_CFLAGS) \ -# -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ -# -DFONTCONFIG_PATH='"$(CONFDIR)"' - load_makefile NORELDBG=1 ..\fc-case\makefile load_makefile NORELDBG=1 ..\fc-glyphname\makefile load_makefile NORELDBG=1 ..\fc-lang\makefile @@ -31,6 +21,7 @@ CSRCS = \ fcmatch.c \ fcmatrix.c \ fcname.c \ + fcobjs.c \ fcpat.c \ fcserialize.c \ fcstat.c \ |