diff -r a748d39fd792 -r 968e67c7780c AMBuildScript --- a/AMBuildScript Fri Dec 17 22:20:10 2010 -0500 +++ b/AMBuildScript Fri Dec 17 22:22:44 2010 -0500 @@ -16,9 +16,9 @@ self.sdkInfo['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '4', 'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']} self.sdkInfo['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '5', - 'name': 'LEFT4DEAD', 'platform': ['windows', 'linux']} + 'name': 'LEFT4DEAD', 'platform': ['windows', 'linux', 'darwin']} self.sdkInfo['l4d2'] = {'sdk': 'HL2SDKL4D2', 'ext': '2.l4d2', 'def': '6', - 'name': 'LEFT4DEAD2', 'platform': ['windows', 'linux']} + 'name': 'LEFT4DEAD2', 'platform': ['windows', 'linux', 'darwin']} self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM', 'ext': '2.darkm', 'def': '2', 'name': 'DARKMESSIAH', 'platform': ['windows']} self.sdkInfo['swarm'] = {'sdk': 'HL2SDK-SWARM', 'ext': '2.swarm', 'def': '7', @@ -33,10 +33,10 @@ if AMBuild.target['platform'] != 'darwin': envvars['HL2SDK'] = 'hl2sdk' envvars['HL2SDKOB'] = 'hl2sdk-ob' - envvars['HL2SDKL4D'] = 'hl2sdk-l4d' - envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2' envvars['HL2SDKOBVALVE'] = 'hl2sdk-ob-valve' + envvars['HL2SDKL4D'] = 'hl2sdk-l4d' + envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2' #Dark Messiah is Windows-only if AMBuild.target['platform'] == 'windows': @@ -83,6 +83,7 @@ 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 @@ 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 @@ 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: