Skip to content

C
core
Kaydet (Commit) ddb68b2e authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

MacOSX doesn't support X based build anymore, stop pretending in set_soenv

üst 832c18da
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 53 deletions
set_soenv.in
Dosyayı görüntüle @ ddb68b2e
...@@ -684,43 +684,49 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) ...@@ -684,43 +684,49 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
} }
} }
elsif ( $platform =~ m/darwin/ ) elsif ( $platform =~ m/darwin/ )
{ $COM = "GCC"; {
$COMPATH = '@COMPATH@'; $COM = "GCC";
if ($platform =~ m/^arm/) $COMPATH = '@COMPATH@';
{ if ($platform =~ m/^arm/)
print "Setting values for iOS... "; {
$oldoutfile = "iOSEnv.Set.sh"; print "Setting values for iOS... ";
$CPU = "R"; $oldoutfile = "iOSEnv.Set.sh";
$CPUNAME = "ARM"; $CPU = "R";
$OUTPATH = "unxiosr"; $CPUNAME = "ARM";
$GUI = "UNX"; $OUTPATH = "unxiosr";
$OS = "IOS"; $GUI = "UNX";
$GUIBASE = "cocoatouch"; $OS = "IOS";
} $GUIBASE = "cocoatouch";
elsif ($platform =~ m/^powerpc/) }
{ elsif ($platform =~ m/^powerpc/)
print "Setting values for Mac OS X/Darwin on PowerPC... "; {
$oldoutfile = "MacOSXPPCEnv.Set.sh"; print "Setting values for Mac OS X/Darwin on PowerPC... ";
$CPU = "P"; $oldoutfile = "MacOSXPPCEnv.Set.sh";
$CPUNAME = "POWERPC"; $CPU = "P";
$OUTPATH = "unxmacxp"; $CPUNAME = "POWERPC";
$OS = "MACOSX"; $OUTPATH = "unxmacxp";
$GUI = "UNX"; $OS = "MACOSX";
} $GUI = "UNX";
else $GUIBASE = "aqua";
{ $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
print "Setting values for Mac OS X/Darwin on default x86... "; $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
$oldoutfile = "MacOSXX86Env.Set.sh"; }
$CPU = "I"; else
$CPUNAME = "INTEL"; {
$OUTPATH = "unxmacxi"; print "Setting values for Mac OS X/Darwin on default x86... ";
$OS = "MACOSX"; $oldoutfile = "MacOSXX86Env.Set.sh";
$GUI = "UNX"; $CPU = "I";
} $CPUNAME = "INTEL";
$GVER = "VCL"; $OUTPATH = "unxmacxi";
$INPATH = $OUTPATH.$PROEXT; $OS = "MACOSX";
$PATH_SEPERATOR = $ps; $GUI = "UNX";
# GUIBASE is set below for Mac OS X; may be "aqua" or "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/ ) elsif ( $platform =~ m/dragonfly/ )
{ {
...@@ -906,22 +912,6 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path ...@@ -906,22 +912,6 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path
$XLIB = PathFormat('@XLIB@'); # X11 libraries $XLIB = PathFormat('@XLIB@'); # X11 libraries
$XINC = PathFormat('@XINC@'); # X11 includes $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. # The project's workstamp.
$WORK_STAMP = "@SOURCEVERSION@"; $WORK_STAMP = "@SOURCEVERSION@";
# Location of the source. # Location of the source.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment