From c5c13c0be9673f12ba3c1a50610afbbb32dab94a Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 16 Sep 2009 14:49:32 +0000
Subject: CWS-TOOLING: integrate CWS cloph13 2009-09-01 #i104566# also use
syslibroot/isysroot for external components 2009-08-28 #i104568# clean up
duplicated definitions of OBJCXXFLAGS 2009-08-28 #i104567# add
ccache-detection to configure (to skip to objcxx-flags) 2009-08-28 #i104566#
use Mac OS X 10.4-SDK to ensure backwards compatibility use
MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot
/Developer/..." arguments for OOo's cpp
---
cairo/cairo/makefile.mk | 4 +++-
cairo/pixman/makefile.mk | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'cairo')
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index a40467f03fe0..dd2300eaa8d1 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -41,7 +41,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.IF "$(ENABLE_CAIRO)" == ""
all:
- @echo "Nothing to do (Cairo not enabled)."
+ @echo "Nothing to do (Cairo not enabled)."
.ELIF "$(SYSTEM_CAIRO)" == "YES"
all:
@@ -113,6 +113,8 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
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)
+cairo_CPPFLAGS+=$(EXTRA_CDEFS)
+cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 1eed5207de86..c48f80c2da49 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -41,11 +41,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.IF "$(ENABLE_CAIRO)" == ""
all:
- @echo "Nothing to do (Cairo not enabled)."
+ @echo "Nothing to do (Cairo not enabled)."
.ELIF "$(BUILD_PIXMAN)" == ""
all:
- @echo "Not building pixman."
+ @echo "Not building pixman."
.ENDIF
@@ -81,7 +81,7 @@ BUILD_ACTION=$(GNUMAKE) -f Makefile.win32
# ----------- Native Mac OS X (Aqua/Quartz) --------------------------------
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
+CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
.IF "$(SYSBASE)"!=""
.IF "$(EXTRA_CFLAGS)"!=""
CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
--
cgit