1.1 --- a/AMBuildScript Fri Dec 17 22:20:10 2010 -0500
1.2 +++ b/AMBuildScript Fri Dec 17 22:22:44 2010 -0500
1.3 @@ -16,9 +16,9 @@
1.4 self.sdkInfo['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '4',
1.5 'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']}
1.6 self.sdkInfo['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '5',
1.7 - 'name': 'LEFT4DEAD', 'platform': ['windows', 'linux']}
1.8 + 'name': 'LEFT4DEAD', 'platform': ['windows', 'linux', 'darwin']}
1.9 self.sdkInfo['l4d2'] = {'sdk': 'HL2SDKL4D2', 'ext': '2.l4d2', 'def': '6',
1.10 - 'name': 'LEFT4DEAD2', 'platform': ['windows', 'linux']}
1.11 + 'name': 'LEFT4DEAD2', 'platform': ['windows', 'linux', 'darwin']}
1.12 self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM', 'ext': '2.darkm', 'def': '2',
1.13 'name': 'DARKMESSIAH', 'platform': ['windows']}
1.14 self.sdkInfo['swarm'] = {'sdk': 'HL2SDK-SWARM', 'ext': '2.swarm', 'def': '7',
1.15 @@ -33,10 +33,10 @@
1.16 if AMBuild.target['platform'] != 'darwin':
1.17 envvars['HL2SDK'] = 'hl2sdk'
1.18 envvars['HL2SDKOB'] = 'hl2sdk-ob'
1.19 - envvars['HL2SDKL4D'] = 'hl2sdk-l4d'
1.20 - envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2'
1.21
1.22 envvars['HL2SDKOBVALVE'] = 'hl2sdk-ob-valve'
1.23 + envvars['HL2SDKL4D'] = 'hl2sdk-l4d'
1.24 + envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2'
1.25
1.26 #Dark Messiah is Windows-only
1.27 if AMBuild.target['platform'] == 'windows':
1.28 @@ -83,6 +83,7 @@
1.29 self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
1.30 self.compiler.AddToListVar('CFLAGS', '-msse')
1.31 self.compiler.AddToListVar('CFLAGS', '-m32')
1.32 + self.compiler.AddToListVar('POSTLINKFLAGS', '-m32')
1.33 self.compiler.AddToListVar('CFLAGS', '-static-libgcc')
1.34 self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions')
1.35 self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti')
1.36 @@ -218,7 +219,7 @@
1.37 else:
1.38 staticLibs = os.path.join(sdkPath, 'lib', 'linux')
1.39 workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
1.40 - if sdk == 'ep2v' or sdk == 'l4d2':
1.41 + if sdk in ['ep2v', 'l4d', 'l4d2']:
1.42 for i in ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']:
1.43 link = os.path.join(workFolder, i)
1.44 target = os.path.join(staticLibs, i)
1.45 @@ -300,7 +301,7 @@
1.46 if not noLink:
1.47 if AMBuild.target['platform'] == 'linux':
1.48 compiler['POSTLINKFLAGS'][0:0] = ['-lm']
1.49 - if sdk == 'ep2v' or sdk == 'l4d2':
1.50 + if sdk in ['ep2v', 'l4d', 'l4d2']:
1.51 compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
1.52 compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
1.53 else: