diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-07-26 15:54:40 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-07-26 15:54:40 -0500 |
| commit | 4f0c8067fae9349780c28189fdf489047122238e (patch) | |
| tree | d24bd304bf0903a402eb04bfc0f0070ea020577f /set_soenv.in | |
| parent | ff88a5f76e0052451414fab72f18c43bc0dcfd7a (diff) | |
MacOSX configure options to support SDK and version min/max
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/set_soenv.in b/set_soenv.in index 39c8ffbacccd..98389f093711 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -85,7 +85,8 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, $PROEXT, $TARFILE_LOCATION, $GNUMAKE, - $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); + $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS, + $MACOSX_SDK_PATH); # #------------------------------------------- # IId. Declaring the aliases. @@ -924,12 +925,17 @@ $XINC = PathFormat('@XINC@'); # X11 includes # Mac OS X/Darwin only variables. if ( $platform =~ m/darwin/ && $platform !~ m/^arm/) -{ $FRAMEWORKSHOME = $ds."Developer".$ds."SDKs".$ds."MacOSX10.4u.sdk".$ds."System".$ds."Library".$ds."Frameworks"; - if ( $XLIB eq "no_x_libraries" ) { - $GUIBASE = "aqua"; - } else { - $GUIBASE = "unx"; - } +{ + $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@'; + $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks"; + if ( $XLIB eq "no_x_libraries" ) + { + $GUIBASE = "aqua"; + } + else + { + $GUIBASE = "unx"; + } } # The project's workstamp. |