Commits

Hans-Joachim Lankenau  committed bf9dbc6

ause129: #i116289# set MACOSX_DEPLOYMENT_TARGET in environment for use in dmake and gnumake build

  • Participants
  • Parent commits 840c014

Comments (0)

Files changed (3)

File set_soenv.in

 ToFile( "SET_EXCEPTIONS",    $SET_EXCEPTIONS,    "e" );
 ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
 ToFile( "FLIPCMD",           $FLIPCMD,           "e" );
+if ( $platform =~ m/darwin/ )
+{
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
+# build can assume functions/libraries of that version to be available
+# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
+# http://developer.apple.com/technotes/tn2002/tn2064.html
+    ToFile( "MACOSX_DEPLOYMENT_TARGET",       "10.4",       "e" );
+}
+
 #
 # Writing the variables to file.
 # (c = comment, e = environment variable, a = alias, n = newline )

File solenv/gbuild/platform/macosx.mk

 gb_CPUDEFS := -DPOWERPC -DPPC
 endif
 
-ifeq ($(SYSBASE), "")
+ifeq ($(strip $(SYSBASE)),)
 gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
 else
 gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
 
 gb_Library_PLAINLIBS_NONE += \
 	Cocoa \
- 	objc \
+	objc \
 	jpeg \
 	m \
 	pthread \

File solenv/inc/unxmacx.mk

 # unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
 # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
 # http://developer.apple.com/technotes/tn2002/tn2064.html
-MACOSX_DEPLOYMENT_TARGET=10.4
-.EXPORT: MACOSX_DEPLOYMENT_TARGET
+# done in setsolar/configure now. left here for documentation
+#MACOSX_DEPLOYMENT_TARGET=10.4
+#.EXPORT: MACOSX_DEPLOYMENT_TARGET
 CDEFS+=-DQUARTZ 
 EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
 .ENDIF