diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-15 09:49:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-15 09:49:37 +0000 |
| commit | 721cd486db826f7af5dc85db8cd39a2ae5374a3c (patch) | |
| tree | 44ffd9d6b41732605517ffac176e71bdfbaee013 /cairo | |
| parent | 21c021e0607307516acbc09a0470adf2586b9171 (diff) | |
#i10000# make cairo buildable for Hamburg RE
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 7 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 16dcb4fc0700..a40467f03fe0 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -60,6 +60,7 @@ cairo_CFLAGS=$(SOLARINC) cairo_LDFLAGS=$(SOLARLIB) cairo_CPPFLAGS= + .IF "$(SYSTEM_ZLIB)"!="YES" cairo_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib cairo_COMPRESS=z_compress @@ -103,6 +104,12 @@ OUT2INC+=src$/cairo-win32.h .ELIF "$(GUIBASE)"=="aqua" # ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)" != "" +cairo_CFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) +cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) +.ENDIF # "$(EXTRA_CFLAGS)" != "" +.ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 93ce36623222..1eed5207de86 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -82,6 +82,11 @@ BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)"!="" +CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)" +.ENDIF # "$(EXTRA_CDEFS)"!="" +.ENDIF # "$(SYSBASE)"!="" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |