Only build OB-Valve binaries on Mac OS X for now (bug 4392, r=dvander).
1.1 --- a/AMBuildScript Wed May 12 04:13:56 2010 -0500
1.2 +++ b/AMBuildScript Thu May 13 04:18:58 2010 -0500
1.3 @@ -9,19 +9,18 @@
1.4
1.5 #Build SDK info
1.6 self.sdkInfo = { }
1.7 - self.sdkInfo['ep1'] = {'sdk': 'HL2SDK', 'ext': '1.ep1', 'def': '1',
1.8 - 'name': 'EPISODEONE'}
1.9 - self.sdkInfo['ep2'] = {'sdk': 'HL2SDKOB', 'ext': '2.ep2', 'def': '3',
1.10 - 'name': 'ORANGEBOX'}
1.11 - self.sdkInfo['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '4',
1.12 - 'name': 'ORANGEBOXVALVE'}
1.13 - self.sdkInfo['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '5',
1.14 - 'name': 'LEFT4DEAD'}
1.15 - self.sdkInfo['l4d2'] = {'sdk': 'HL2SDKL4D2', 'ext': '2.l4d2', 'def': '6',
1.16 - 'name': 'LEFT4DEAD2'}
1.17 - if AMBuild.target['platform'] == 'windows':
1.18 - self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM', 'ext': '2.darkm', 'def': '2',
1.19 - 'name': 'DARKMESSIAH'}
1.20 + self.sdkInfo['ep1'] = {'sdk': 'HL2SDK', 'ext': '1.ep1', 'def': '1',
1.21 + 'name': 'EPISODEONE', 'platform': ['windows', 'linux']}
1.22 + self.sdkInfo['ep2'] = {'sdk': 'HL2SDKOB', 'ext': '2.ep2', 'def': '3',
1.23 + 'name': 'ORANGEBOX', 'platform': ['windows', 'linux']}
1.24 + self.sdkInfo['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '4',
1.25 + 'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']}
1.26 + self.sdkInfo['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '5',
1.27 + 'name': 'LEFT4DEAD', 'platform': ['windows', 'linux']}
1.28 + self.sdkInfo['l4d2'] = {'sdk': 'HL2SDKL4D2', 'ext': '2.l4d2', 'def': '6',
1.29 + 'name': 'LEFT4DEAD2', 'platform': ['windows', 'linux']}
1.30 + self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM', 'ext': '2.darkm', 'def': '2',
1.31 + 'name': 'DARKMESSIAH', 'platform': ['windows']}
1.32
1.33 if AMBuild.mode == 'config':
1.34 #Detect compilers
1.35 @@ -29,14 +28,16 @@
1.36
1.37 #Detect variables
1.38 envvars = { 'MMSOURCE18': 'mmsource-1.8',
1.39 - 'HL2SDK': 'hl2sdk',
1.40 - 'HL2SDKOB': 'hl2sdk-ob',
1.41 - 'HL2SDKL4D': 'hl2sdk-l4d',
1.42 'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
1.43 - 'HL2SDKL4D2': 'hl2sdk-l4d2',
1.44 'MYSQL5': 'mysql-5.0'
1.45 }
1.46
1.47 + if AMBuild.target['platform'] != 'darwin':
1.48 + envvars['HL2SDK'] = 'hl2sdk'
1.49 + envvars['HL2SDKOB'] = 'hl2sdk-ob'
1.50 + envvars['HL2SDKL4D'] = 'hl2sdk-l4d'
1.51 + envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2'
1.52 +
1.53 #Dark Messiah is Windows-only
1.54 if AMBuild.target['platform'] == 'windows':
1.55 envvars['HL2SDK-DARKM'] = 'hl2sdk-darkm'
1.56 @@ -243,7 +244,6 @@
1.57
1.58 info = self.sdkInfo
1.59 compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
1.60 - compiler['CDEFINES'].append('SE_DARKMESSIAH=2')
1.61
1.62 paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
1.63 ['public', 'tier0'], ['public', 'tier1']]
2.1 --- a/core/AMBuilder Wed May 12 04:13:56 2010 -0500
2.2 +++ b/core/AMBuilder Thu May 13 04:18:58 2010 -0500
2.3 @@ -3,6 +3,9 @@
2.4
2.5 for i in SM.sdkInfo:
2.6 sdk = SM.sdkInfo[i]
2.7 + if AMBuild.target['platform'] not in sdk['platform']:
2.8 + continue
2.9 +
2.10 name = 'sourcemod.' + sdk['ext']
2.11
2.12 compiler = SM.DefaultHL2Compiler('core', i)
3.1 --- a/extensions/bintools/AMBuilder Wed May 12 04:13:56 2010 -0500
3.2 +++ b/extensions/bintools/AMBuilder Thu May 13 04:18:58 2010 -0500
3.3 @@ -3,6 +3,9 @@
3.4
3.5 for i in SM.sdkInfo:
3.6 sdk = SM.sdkInfo[i]
3.7 + if AMBuild.target['platform'] not in sdk['platform']:
3.8 + continue
3.9 +
3.10 name = 'bintools.ext.' + sdk['ext']
3.11
3.12 compiler = SM.DefaultHL2Compiler('extensions/bintools', i, True, '')
4.1 --- a/extensions/cstrike/AMBuilder Wed May 12 04:13:56 2010 -0500
4.2 +++ b/extensions/cstrike/AMBuilder Thu May 13 04:18:58 2010 -0500
4.3 @@ -2,20 +2,22 @@
4.4 import os
4.5
4.6 sdk = SM.sdkInfo['ep1']
4.7 -compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep1')
4.8 +
4.9 +if AMBuild.target['platform'] in sdk['platform']:
4.10 + compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep1')
4.11
4.12 -name = 'game.cstrike.ext.' + sdk['ext']
4.13 -extension = AMBuild.AddJob(name)
4.14 -binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
4.15 -SM.PreSetupHL2Job(extension, binary, 'ep1')
4.16 -binary.AddSourceFiles('extensions/cstrike', [
4.17 - 'extension.cpp',
4.18 - 'natives.cpp',
4.19 - 'RegNatives.cpp',
4.20 - 'timeleft.cpp',
4.21 - 'sdk/smsdk_ext.cpp'
4.22 - ])
4.23 -SM.PostSetupHL2Job(extension, binary, 'ep1')
4.24 -SM.AutoVersion('extensions/cstrike', binary)
4.25 -binary.SendToJob()
4.26 + name = 'game.cstrike.ext.' + sdk['ext']
4.27 + extension = AMBuild.AddJob(name)
4.28 + binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
4.29 + SM.PreSetupHL2Job(extension, binary, 'ep1')
4.30 + binary.AddSourceFiles('extensions/cstrike', [
4.31 + 'extension.cpp',
4.32 + 'natives.cpp',
4.33 + 'RegNatives.cpp',
4.34 + 'timeleft.cpp',
4.35 + 'sdk/smsdk_ext.cpp'
4.36 + ])
4.37 + SM.PostSetupHL2Job(extension, binary, 'ep1')
4.38 + SM.AutoVersion('extensions/cstrike', binary)
4.39 + binary.SendToJob()
4.40
5.1 --- a/extensions/sdktools/AMBuilder Wed May 12 04:13:56 2010 -0500
5.2 +++ b/extensions/sdktools/AMBuilder Thu May 13 04:18:58 2010 -0500
5.3 @@ -2,6 +2,10 @@
5.4 import os
5.5
5.6 for i in SM.sdkInfo:
5.7 + sdk = SM.sdkInfo[i]
5.8 + if AMBuild.target['platform'] not in sdk['platform']:
5.9 + continue
5.10 +
5.11 compiler = SM.DefaultHL2Compiler('extensions/sdktools', i)
5.12 compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit'))
5.13 compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86'))
5.14 @@ -9,7 +13,6 @@
5.15 if i != 'ep1':
5.16 compiler['CDEFINES'].append('HOOKING_ENABLED')
5.17
5.18 - sdk = SM.sdkInfo[i]
5.19 name = 'sdktools.ext.' + sdk['ext']
5.20 extension = AMBuild.AddJob(name)
5.21 binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
