diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-10 00:34:33 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-10 00:34:47 -0600 |
| commit | ddb68b2eadf7c2aeea1625be734829541f3fe4af (patch) | |
| tree | 2416791c8ad1818412b25fcd6f140c169e07c27f /set_soenv.in | |
| parent | 832c18da69aa944dffae8f7d7a351f352a94cfcf (diff) | |
MacOSX doesn't support X based build anymore, stop pretending in set_soenv
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 96 |
1 files changed, 43 insertions, 53 deletions
diff --git a/set_soenv.in b/set_soenv.in index e7e62ffa9bdf..6ccb3c9263a8 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -684,43 +684,49 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) } } elsif ( $platform =~ m/darwin/ ) -{ $COM = "GCC"; - $COMPATH = '@COMPATH@'; - if ($platform =~ m/^arm/) - { - print "Setting values for iOS... "; - $oldoutfile = "iOSEnv.Set.sh"; - $CPU = "R"; - $CPUNAME = "ARM"; - $OUTPATH = "unxiosr"; - $GUI = "UNX"; - $OS = "IOS"; - $GUIBASE = "cocoatouch"; - } - elsif ($platform =~ m/^powerpc/) - { - print "Setting values for Mac OS X/Darwin on PowerPC... "; - $oldoutfile = "MacOSXPPCEnv.Set.sh"; - $CPU = "P"; - $CPUNAME = "POWERPC"; - $OUTPATH = "unxmacxp"; - $OS = "MACOSX"; - $GUI = "UNX"; - } - else - { - print "Setting values for Mac OS X/Darwin on default x86... "; - $oldoutfile = "MacOSXX86Env.Set.sh"; - $CPU = "I"; - $CPUNAME = "INTEL"; - $OUTPATH = "unxmacxi"; - $OS = "MACOSX"; - $GUI = "UNX"; - } - $GVER = "VCL"; - $INPATH = $OUTPATH.$PROEXT; - $PATH_SEPERATOR = $ps; - # GUIBASE is set below for Mac OS X; may be "aqua" or "unx". +{ + $COM = "GCC"; + $COMPATH = '@COMPATH@'; + if ($platform =~ m/^arm/) + { + print "Setting values for iOS... "; + $oldoutfile = "iOSEnv.Set.sh"; + $CPU = "R"; + $CPUNAME = "ARM"; + $OUTPATH = "unxiosr"; + $GUI = "UNX"; + $OS = "IOS"; + $GUIBASE = "cocoatouch"; + } + elsif ($platform =~ m/^powerpc/) + { + print "Setting values for Mac OS X/Darwin on PowerPC... "; + $oldoutfile = "MacOSXPPCEnv.Set.sh"; + $CPU = "P"; + $CPUNAME = "POWERPC"; + $OUTPATH = "unxmacxp"; + $OS = "MACOSX"; + $GUI = "UNX"; + $GUIBASE = "aqua"; + $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... "; + $oldoutfile = "MacOSXX86Env.Set.sh"; + $CPU = "I"; + $CPUNAME = "INTEL"; + $OUTPATH = "unxmacxi"; + $OS = "MACOSX"; + $GUI = "UNX"; + $GUIBASE = "aqua"; + $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@'; + $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks"; + } + $GVER = "VCL"; + $INPATH = $OUTPATH.$PROEXT; + $PATH_SEPERATOR = $ps; } elsif ( $platform =~ m/dragonfly/ ) { @@ -906,22 +912,6 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path $XLIB = PathFormat('@XLIB@'); # X11 libraries $XINC = PathFormat('@XINC@'); # X11 includes - -# Mac OS X/Darwin only variables. -if ( $platform =~ m/darwin/ && $platform !~ m/^arm/) -{ - $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. $WORK_STAMP = "@SOURCEVERSION@"; # Location of the source. |