[Libreoffice-commits] .: solenv/inc

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Tue Jul 26 16:54:00 PDT 2011


 solenv/inc/unxmacx.mk |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e6fc486e4a712a1b8931acddb5d959dc499fef67
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Jul 26 18:53:53 2011 -0500

    move MAC_OS_X_VERSION* define to EXTRA_CDEF for exteenal modules

diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index cf196d4..18e3931 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -48,10 +48,9 @@ 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
-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)
+CDEFS:+=-DQUARTZ
 
-EXTRA_CDEFS*:=-isysroot $(MACOSX_SDK_PATH)
+EXTRA_CDEFS:+=-isysroot $(MACOSX_SDK_PATH)  -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED)
 .ENDIF
 
 # Name of library where static data members are initialized


More information about the Libreoffice-commits mailing list