diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-09 19:09:14 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 19:34:00 -0600 |
commit | 4475360e5e90be683102e9451721a61d6dcb2bcf (patch) | |
tree | a6abc1cb8730f1ec1f47bebdbac4d6e4170eb530 /set_soenv.in | |
parent | move COMPATH,EPM_FLAGS and connex variables out of set_soenv.in (diff) | |
download | core-4475360e5e90be683102e9451721a61d6dcb2bcf.tar.gz core-4475360e5e90be683102e9451721a61d6dcb2bcf.zip |
Move MACOS related variable out of set_soenv.in
Diffstat (limited to 'set_soenv.in')
-rwxr-xr-x | set_soenv.in | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/set_soenv.in b/set_soenv.in index e67b95658f5c..64990e6d8861 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -78,7 +78,6 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $WIN_GNUCOPY, $WIN_TOUCH, $PROEXT, $TARFILE_LOCATION, $GNUMAKE, $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, - $MACOSX_SDK_PATH, $SYSBASE); # #------------------------------------------- @@ -91,6 +90,7 @@ my ( $dmake, $build, $mkout, $deliver, $zipdep ); $INPATH="@INPATH@"; $OUTPATH="@OUTPATH@"; $COMPATH="@COMPATH@"; +$FRAMEWORKSHOME="@FRAMEWORKSHOME@"; #------------------------------------------------------------- # IIIa. Initialising constants. #------------------------------------------------------------- @@ -178,22 +178,6 @@ if ( $platform =~ m/cygwin|mingw32/ ) } elsif ( $platform =~ m/darwin/ ) { - if ($platform =~ m/^arm/) - { - print "Setting values for iOS... "; - } - elsif ($platform =~ m/^powerpc/) - { - print "Setting values for Mac OS X/Darwin on PowerPC... "; - $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@'; - $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks"; - } - else - { - print "Setting values for Mac OS X/Darwin on default x86... "; - $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@'; - $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks"; - } } print "done\n"; @@ -723,7 +707,6 @@ ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" ); ToFile( "ANT", PathFormat("@ANT@"), "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); -ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" ); ToFile( "Empty", $empty, "n" ); # @@ -751,19 +734,6 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" ); ToFile( "DYNAMIC_CRT", $DYNAMIC_CRT, "e" ); ToFile( "use_shl_versions", $use_shl_versions, "e" ); -if ( $platform =~ m/darwin/ && $platform !~ m/^arm/) -{ -# 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", "@MACOSX_DEPLOYMENT_TARGET@", "e" ); - ToFile( "MACOSX_SDK_PATH", "@MACOSX_SDK_PATH@", "e" ); - ToFile( "MAC_OS_X_VERSION_MIN_REQUIRED", "@MAC_OS_X_VERSION_MIN_REQUIRED@", "e" ); - ToFile( "MAC_OS_X_VERSION_MAX_ALLOWED", "@MAC_OS_X_VERSION_MAX_ALLOWED@", "e" ); -} - # # Writing the variables to file. # (c = comment, e = environment variable, a = alias, n = newline ) @@ -873,7 +843,6 @@ if ( '@CROSS_COMPILING@' eq 'YES' ) ToFile( "CC_FOR_BUILD", "@CC_FOR_BUILD@", "e" ); ToFile( "CXX_FOR_BUILD", "@CXX_FOR_BUILD@", "e" ); ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" ); - ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" ); ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" ); ToFile( "OUTDIR_FOR_BUILD", "@OUTDIR_FOR_BUILD@", "e"); ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e"); |