1.1 --- a/AMBuildScript Mon Jul 02 22:36:40 2012 -0400
1.2 +++ b/AMBuildScript Wed Jul 18 13:44:57 2012 -0400
1.3 @@ -9,21 +9,22 @@
1.4
1.5 #Build SDK info
1.6 self.sdkInfo = { }
1.7 - self.sdkInfo['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '', 'def': '5',
1.8 + self.sdkInfo['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '6',
1.9 'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']}
1.10 +
1.11 + self.sdkInfo['csgo'] = {'sdk': 'HL2SDKCSGO', 'ext': '2.csgo', 'def': '11',
1.12 + 'name': 'CSGO', 'platform': ['windows', 'linux']}
1.13
1.14 if AMBuild.mode == 'config':
1.15 #Detect compilers
1.16 self.compiler.DetectAll(AMBuild)
1.17
1.18 #Detect variables
1.19 - envvars = { 'MMSOURCE18': 'mmsource-1.8' }
1.20 - if AMBuild.target['platform'] == 'darwin':
1.21 - envvars['SOURCEMOD'] = 'sourcemod-1.4'
1.22 - else:
1.23 - envvars['SOURCEMOD'] = 'sourcemod-1.3'
1.24 + envvars = { 'MMSOURCE19': 'mmsource-1.9' }
1.25 + envvars['SOURCEMOD'] = 'sourcemod-1.4'
1.26 envvars['SOURCEMOD-BIN'] = 'sourcemod-bin'
1.27 envvars['HL2SDKOBVALVE'] = 'hl2sdk-ob-valve'
1.28 + envvars['HL2SDKCSGO'] = 'hl2sdk-csgo'
1.29
1.30 #Must have a path for each envvar (file a bug if you don't like this)
1.31 for i in envvars:
1.32 @@ -176,7 +177,7 @@
1.33 self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
1.34 self.compiler.AddToListVar('RCINCLUDES',
1.35 os.path.join(AMBuild.outputFolder, 'includes'))
1.36 - self.mmsPath = AMBuild.cache['MMSOURCE18']
1.37 + self.mmsPath = AMBuild.cache['MMSOURCE19']
1.38 self.smSourcePath = AMBuild.cache['SOURCEMOD']
1.39 self.smBinPath = AMBuild.cache['SOURCEMOD-BIN']
1.40
1.41 @@ -214,8 +215,11 @@
1.42 else:
1.43 staticLibs = os.path.join(sdkPath, 'lib', 'linux')
1.44 workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
1.45 - if sdk in ['ep2v', 'l4d', 'l4d2']:
1.46 - for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
1.47 + if sdk in ['ep2v', 'l4d', 'l4d2', 'csgo']:
1.48 + libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']
1.49 + if sdk == 'csgo':
1.50 + libs.append('interfaces_i486.a')
1.51 + for i in libs:
1.52 link = os.path.join(workFolder, i)
1.53 target = os.path.join(staticLibs, i)
1.54 try:
1.55 @@ -233,7 +237,10 @@
1.56 elif AMBuild.target['platform'] == 'darwin':
1.57 staticLibs = os.path.join(sdkPath, 'lib', 'mac')
1.58 workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
1.59 - for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']:
1.60 + libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
1.61 + if sdk == 'csgo':
1.62 + libs.append('interfaces_i486.a')
1.63 + for i in libs:
1.64 link = os.path.join(workFolder, i)
1.65 target = os.path.join(staticLibs, i)
1.66 try:
1.67 @@ -242,7 +249,7 @@
1.68 job.AddCommand(SymlinkCommand(link, target))
1.69 elif AMBuild.target['platform'] == 'windows':
1.70 libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
1.71 - if sdk == 'swarm':
1.72 + if sdk == 'swarm' or sdk == 'csgo':
1.73 libs.append('interfaces')
1.74 for lib in libs:
1.75 libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
1.76 @@ -252,6 +259,8 @@
1.77 def PostSetupHL2Job(self, job, builder, sdk):
1.78 if AMBuild.target['platform'] in ['linux', 'darwin']:
1.79 builder.AddObjectFiles(['tier1_i486.a', 'mathlib_i486.a'])
1.80 + if sdk == 'csgo':
1.81 + builder.AddObjectFiles(['interfaces_i486.a'])
1.82
1.83 def DefaultHL2Compiler(self, path, sdk, noLink = False, oldMms = '-legacy'):
1.84 compiler = self.DefaultCompiler()
1.85 @@ -285,8 +294,11 @@
1.86
1.87 compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
1.88
1.89 - if sdk == 'swarm' and AMBuild.target['platform'] == 'windows':
1.90 - compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
1.91 + if sdk in ['swarm','csgo']:
1.92 + if AMBuild.target['platform'] == 'windows':
1.93 + compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
1.94 + else:
1.95 + compiler['CDEFINES'].extend(['COMPILER_GCC', 'POSIX'])
1.96
1.97 if sdk == 'ep1':
1.98 if AMBuild.target['platform'] == 'linux':
1.99 @@ -303,7 +315,7 @@
1.100 if not noLink:
1.101 if AMBuild.target['platform'] == 'linux':
1.102 compiler['POSTLINKFLAGS'][0:0] = ['-lm']
1.103 - if sdk in ['ep2v', 'l4d', 'l4d2']:
1.104 + if sdk in ['ep2v', 'l4d', 'l4d2', 'csgo']:
1.105 compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
1.106 compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
1.107 else: