From 9f545ab26976325cfd746223e0152d4bf6f049e3 Mon Sep 17 00:00:00 2001 From: Dr!fter Date: Sun, 1 Sep 2013 21:42:13 -0400 Subject: [PATCH] Fix build --- AMBuildScript | 4 ++-- buildbot/bootstrap.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index d722e76..622f82b 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -272,7 +272,7 @@ class SM: else: staticLibs = os.path.join(sdkPath, 'lib', 'linux') workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) - if sdk in ['ep2v', 'css']: + if sdk in ['tf2', 'css', 'l4d2', 'hl2dm', 'dods']: libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so'] for i in libs: link = os.path.join(workFolder, i) @@ -284,7 +284,7 @@ class SM: job.AddCommand(command.DirectCommand(['cp', '-f', target, link])) else: job.AddCommand(SymlinkCommand(link, target)) - elif sdk in ['l4d', 'l4d2', 'csgo']: + elif sdk in ['l4d', 'csgo', 'nd']: libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so'] if sdk == 'csgo': libs.append('interfaces_i486.a') diff --git a/buildbot/bootstrap.pl b/buildbot/bootstrap.pl index 1c4fead..7368dcd 100644 --- a/buildbot/bootstrap.pl +++ b/buildbot/bootstrap.pl @@ -33,7 +33,7 @@ if ($^O eq "linux") { # print $result; #} - $ENV{'SOURCEMOD14'} = '/home/builds/common/sourcemod-1.4'; + #$ENV{'SOURCEMOD14'} = '/home/builds/common/sourcemod-1.4'; $ENV{'SMCENTRAL'} = '/home/builds/common/sourcemod-central'; $ENV{'MMSOURCE19'} = '/home/builds/common/mmsource-1.9'; @@ -52,7 +52,7 @@ if ($^O eq "linux") { # print $result; #} - $ENV{'SOURCEMOD14'} = '/Users/builds/slaves/common/sourcemod-1.4'; + #$ENV{'SOURCEMOD14'} = '/Users/builds/slaves/common/sourcemod-1.4'; $ENV{'SMCENTRAL'} = '/Users/builds/slaves/common/sourcemod-central'; $ENV{'MMSOURCE18'} = '/Users/builds/slaves/common/mmsource-1.8'; $ENV{'MMSOURCE19'} = '/Users/builds/slaves/common/mmsource-central';