UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed build scripts for OS X 10.7 build slave.

Browse Source
This commit is contained in:
Scott Ehlert 2012-03-21 21:35:07 -05:00
parent c7646976fb
commit a3593a5124
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AMBuildScript
View File

@ -122,6 +122,9 @@ class SM:
self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics') self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor') self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual') self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual')
if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 3) or \
(self.vendor == 'clang' and cxx.majorVersion >= 3):
self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor')
self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H') self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
self.compiler.AddToListVar('CDEFINES', 'GNUC') self.compiler.AddToListVar('CDEFINES', 'GNUC')
if self.vendor == 'gcc': if self.vendor == 'gcc':

6
tools/buildbot/bootstrap.pl
View File

@ -47,12 +47,12 @@ if ($reconf) {
$argn = $#ARGV + 1; $argn = $#ARGV + 1;
print "Attempting to reconfigure...\n"; print "Attempting to reconfigure...\n";
if ($argn > 0 && $^O !~ /MSWin/) { if ($argn > 0 && $^O !~ /MSWin/) {
$result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`; $result = `CC=$ARGV[0] CXX=$ARGV[0] python3 ../build/configure.py --enable-optimize`;
} else { } else {
if ($^O eq "linux") { if ($^O eq "linux") {
$result = `CC=gcc-4.4 CXX=gcc-4.4 python3.1 ../build/configure.py --enable-optimize`; $result = `CC=gcc-4.4 CXX=gcc-4.4 python3 ../build/configure.py --enable-optimize`;
} elsif ($^O eq "darwin") { } elsif ($^O eq "darwin") {
$result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`; $result = `CC=clang CXX=clang python3 ../build/configure.py --enable-optimize`;
} else { } else {
$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
} }

2
tools/buildbot/startbuild.pl
View File

@ -11,7 +11,7 @@ require 'helpers.pm';
chdir('../../../OUTPUT'); chdir('../../../OUTPUT');
if ($^O eq "linux" || $^O eq "darwin") { if ($^O eq "linux" || $^O eq "darwin") {
system("python3.1 build.py 2>&1"); system("python3 build.py 2>&1");
} else { } else {
system("C:\\Python31\\python.exe build.py 2>&1"); system("C:\\Python31\\python.exe build.py 2>&1");
} }