From baff0e271de430bb598df5ddef012f70132a5ab3 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 27 Oct 2010 21:58:41 -0700 Subject: [PATCH] Fixed loading on L4D on Linux (bug 4680, r=dvander). --- AMBuildScript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index e2bc6e8..15a430f 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -83,6 +83,7 @@ class MMS: self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse') self.compiler.AddToListVar('CFLAGS', '-msse') self.compiler.AddToListVar('CFLAGS', '-m32') + self.compiler.AddToListVar('POSTLINKFLAGS', '-m32') self.compiler.AddToListVar('CFLAGS', '-static-libgcc') self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions') self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti') @@ -218,7 +219,7 @@ class MMS: else: staticLibs = os.path.join(sdkPath, 'lib', 'linux') workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) - if sdk == 'ep2v' or sdk == 'l4d2': + if sdk in ['ep2v', 'l4d', 'l4d2']: for i in ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']: link = os.path.join(workFolder, i) target = os.path.join(staticLibs, i) @@ -300,7 +301,7 @@ class MMS: if not noLink: if AMBuild.target['platform'] == 'linux': compiler['POSTLINKFLAGS'][0:0] = ['-lm'] - if sdk == 'ep2v' or sdk == 'l4d2': + if sdk in ['ep2v', 'l4d', 'l4d2']: compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so'] compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so'] else: