diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 09:43:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 09:43:18 +0100 |
| commit | 8cf76f19c5bcaebd2e35a62d41e1d0ecd46fd94f (patch) | |
| tree | c10a74e7f918d33b6bb7298b344b18e180d92727 /cairo | |
| parent | b4c74957cbec8ce1fab512983f5133223376545e (diff) | |
Build ps and pdf cairo surfaces with MSVC
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo-1.10.2.patch | 12 | ||||
| -rw-r--r-- | cairo/cairo/makefile.mk | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 195af1691fce..74c139da89b3 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -9,14 +9,10 @@ CAIRO_HAS_GL_SURFACE=0 CAIRO_HAS_DIRECTFB_SURFACE=0 CAIRO_HAS_VG_SURFACE=0 -@@ -28,9 +28,9 @@ - CAIRO_HAS_SCRIPT_SURFACE=0 - CAIRO_HAS_FT_FONT=0 +@@ -30,7 +30,7 @@ CAIRO_HAS_FC_FONT=0 --CAIRO_HAS_PS_SURFACE=1 --CAIRO_HAS_PDF_SURFACE=1 -+CAIRO_HAS_PS_SURFACE=0 -+CAIRO_HAS_PDF_SURFACE=0 + CAIRO_HAS_PS_SURFACE=1 + CAIRO_HAS_PDF_SURFACE=1 -CAIRO_HAS_SVG_SURFACE=1 +CAIRO_HAS_SVG_SURFACE=0 CAIRO_HAS_TEST_SURFACES=0 @@ -47,7 +43,7 @@ else ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ -CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib -+CAIRO_LIBS += $(top_builddir)/../zlib/zlib.lib ++CAIRO_LIBS += $(ZLIB3RDLIB) endif DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 0eaef2488c4b..7f84e3dedda2 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -100,7 +100,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ENDIF .ELSE # WNT, not GCC -BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=$(ZLIB3RDLIB) BUILD_DIR= .ENDIF |