diff --git a/AMBuildScript b/AMBuildScript index 28fa7d2..293e5bf 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -22,7 +22,7 @@ class SM: #Detect variables envvars = { 'MMSOURCE18': 'mmsource-1.8', '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) diff --git a/AMBuilder b/AMBuilder index ddc42d6..4ae79e7 100644 --- a/AMBuilder +++ b/AMBuilder @@ -7,10 +7,10 @@ for i in SM.sdkInfo: continue compiler = SM.DefaultHL2Compiler('', i) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public', 'sourcepawn')) - #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public', 'jit')) - #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD13'], 'public', 'jit', 'x86')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'sourcepawn')) + #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'jit')) + #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'jit', 'x86')) if compiler.cc.name == 'gcc': compiler['CFLAGS'].append('-Wno-parentheses') diff --git a/buildbot/bootstrap.pl b/buildbot/bootstrap.pl index 3e5872f..7680d7d 100644 --- a/buildbot/bootstrap.pl +++ b/buildbot/bootstrap.pl @@ -25,17 +25,17 @@ print "Attempting to reconfigure...\n"; #update and configure shiz 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{'HL2SDKOBVALVE'} = '/home/builds/common/hl2sdk-ob-valve'; } 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{'HL2SDKOBVALVE'} = '/Users/builds/slaves/common/hl2sdk-ob-valve'; } 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{'HL2SDKOBVALVE'} = 'H:/hl2sdk-ob-valve';