mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build ps and pdf cairo surfaces with MSVC

Browse Source
This commit is contained in:
Fridrich Štrba
2011-12-19 09:43:18 +01:00
parent b4c74957cb
commit 8cf76f19c5
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cairo/cairo-1.10.2.patch
View File

@@ -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)

2
cairo/cairo/makefile.mk
View File

@@ -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