UNLOZE/sm-ext-connect
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched to SourceMod 1.4

Browse Source
This commit is contained in:
Asher Baker 2012-05-31 12:04:24 +01:00
parent bb63c358ec
commit 376bf28f76
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AMBuildScript
View File

@ -22,7 +22,7 @@ class SM:
#Detect variables #Detect variables
envvars = { 'MMSOURCE18': 'mmsource-1.8', envvars = { 'MMSOURCE18': 'mmsource-1.8',
'HL2SDKOBVALVE': 'hl2sdk-ob-valve', 'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
'SOURCEMOD13': 'sourcemod-1.3' 'SOURCEMOD14': 'sourcemod-1.4'
} }
#Must have a path for each envvar (file a bug if you don't like this) #Must have a path for each envvar (file a bug if you don't like this)

8
AMBuilder
View File

@ -7,10 +7,10 @@ for i in SM.sdkInfo:
continue continue
compiler = SM.DefaultHL2Compiler('', i) compiler = SM.DefaultHL2Compiler('', i)
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public'))
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public', 'sourcepawn')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'sourcepawn'))
#compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public', 'jit')) #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'jit'))
#compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public', 'jit', 'x86')) #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'jit', 'x86'))
if compiler.cc.name == 'gcc': if compiler.cc.name == 'gcc':
compiler['CFLAGS'].append('-Wno-parentheses') compiler['CFLAGS'].append('-Wno-parentheses')

6
buildbot/bootstrap.pl
View File

@ -25,17 +25,17 @@ print "Attempting to reconfigure...\n";
#update and configure shiz #update and configure shiz
if ($^O eq "linux") { if ($^O eq "linux") {
$ENV{'SOURCEMOD13'} = '/home/builds/common/sourcemod-1.3'; $ENV{'SOURCEMOD14'} = '/home/builds/common/sourcemod-1.4';
$ENV{'MMSOURCE18'} = '/home/builds/common/mmsource-1.8'; $ENV{'MMSOURCE18'} = '/home/builds/common/mmsource-1.8';
$ENV{'HL2SDKOBVALVE'} = '/home/builds/common/hl2sdk-ob-valve'; $ENV{'HL2SDKOBVALVE'} = '/home/builds/common/hl2sdk-ob-valve';
} elsif ($^O eq "darwin") { } elsif ($^O eq "darwin") {
$ENV{'SOURCEMOD13'} = '/Users/builds/slaves/common/sourcemod-1.3'; $ENV{'SOURCEMOD14'} = '/Users/builds/slaves/common/sourcemod-1.4';
$ENV{'MMSOURCE18'} = '/Users/builds/slaves/common/mmsource-1.8'; $ENV{'MMSOURCE18'} = '/Users/builds/slaves/common/mmsource-1.8';
$ENV{'HL2SDKOBVALVE'} = '/Users/builds/slaves/common/hl2sdk-ob-valve'; $ENV{'HL2SDKOBVALVE'} = '/Users/builds/slaves/common/hl2sdk-ob-valve';
} else { } else {
$ENV{'SOURCEMOD13'} = 'C:/Scripts/common/sourcemod-1.3'; $ENV{'SOURCEMOD14'} = 'C:/Scripts/common/sourcemod-1.4';
$ENV{'MMSOURCE18'} = 'C:/Scripts/common/mmsource-1.8'; $ENV{'MMSOURCE18'} = 'C:/Scripts/common/mmsource-1.8';
#$ENV{'HL2SDKOBVALVE'} = 'H:/hl2sdk-ob-valve'; #$ENV{'HL2SDKOBVALVE'} = 'H:/hl2sdk-ob-valve';