diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 19:03:04 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 19:06:07 +0100 |
| commit | a651ccbc873436238a5c7a134d426e003133c737 (patch) | |
| tree | d7d27fc3a114cb36a1638e69c70f29a3b4a3f048 /cairo | |
| parent | 4a0a1d83da07eed79cdd956eb1a7a2905f2ae017 (diff) | |
Build all default cairo features on Windows
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo-1.10.2.patch | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index cd6b3506f421..6bc44c90b69b 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,33 +1,6 @@ ---- misc/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.000000000 +0200 -+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.000000000 +0200 -@@ -18,7 +18,7 @@ - CAIRO_HAS_DRM_XR_FUNCTIONS=0 - CAIRO_HAS_GALLIUM_SURFACE=0 - CAIRO_HAS_XCB_DRM_FUNCTIONS=0 --CAIRO_HAS_PNG_FUNCTIONS=1 -+CAIRO_HAS_PNG_FUNCTIONS=0 - CAIRO_HAS_GL_SURFACE=0 - CAIRO_HAS_DIRECTFB_SURFACE=0 - CAIRO_HAS_VG_SURFACE=0 -@@ -30,7 +30,7 @@ - CAIRO_HAS_FC_FONT=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 - CAIRO_HAS_TEE_SURFACE=0 - CAIRO_HAS_XML_SURFACE=0 -@@ -37,5 +37,5 @@ - CAIRO_HAS_PTHREAD=0 - CAIRO_HAS_GOBJECT_FUNCTIONS=0 - CAIRO_HAS_TRACE=0 --CAIRO_HAS_INTERPRETER=1 -+CAIRO_HAS_INTERPRETER=0 - CAIRO_HAS_SYMBOL_LOOKUP=0 --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.000000000 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.000000000 +0200 -@@ -22,8 +22,8 @@ +@@ -22,24 +22,26 @@ OPT := -MD -O2 endif @@ -38,7 +11,10 @@ CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -@@ -33,13 +33,15 @@ + LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/ +-CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib ++CAIRO_LIBS += libpng.lib + endif ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) else ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ |