summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-11 11:07:23 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-11 11:16:59 +0200
commite103887c8c158e7059a586ef5a5f7b234c547dfe (patch)
tree6cbcabd6d270e595578cc283afadd5b4023bd718 /solenv
parent4d23222b15ac0034e265441c71405a48403721f8 (diff)
QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to compilations. Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/macosx.mk1
-rw-r--r--solenv/inc/unxmacx.mk1
2 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ed596e7b3c13..0de72bb8fa93 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -41,7 +41,6 @@ gb_OSDEFS := \
-DUNX \
-D_REENTRANT \
-DNO_PTHREAD_PRIORITY \
- -DQUARTZ \
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 0a58f4cc10b8..6b866b91a530 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -47,7 +47,6 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI
# done in setsolar/configure now. left here for documentation
#MACOSX_DEPLOYMENT_TARGET=10.4
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
-CDEFS+:=-DQUARTZ
EXTRA_CDEFS+:=-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)