AMBuildScript
changeset 856 4bf3ed73bba4
parent 850 3d9258ef9a30
child 857 d8cc9c7087b0
     1.1 --- a/AMBuildScript	Sat Aug 03 13:56:58 2013 -0400
     1.2 +++ b/AMBuildScript	Tue Oct 08 21:01:53 2013 -0400
     1.3 @@ -9,54 +9,57 @@
     1.4  
     1.5  		#Build SDK info
     1.6  		self.possibleSdks = { }
     1.7 -		self.possibleSdks['ep1'] =   {'sdk': 'HL2SDK',          'ext': '1.ep1',   'def': '1',
     1.8 +		self.possibleSdks['ep1'] =   {'sdk': 'HL2SDK',          'ext': '1.ep1',      'def': '1',
     1.9  		                         'name': 'EPISODEONE',     'platform': ['windows', 'linux'],
    1.10  		                         'dir': 'hl2sdk'}
    1.11 -		self.possibleSdks['ep2'] =   {'sdk': 'HL2SDKOB',        'ext': '2.ep2',   'def': '3',
    1.12 +		self.possibleSdks['ep2'] =   {'sdk': 'HL2SDKOB',        'ext': '2.ep2',      'def': '3',
    1.13  		                         'name': 'ORANGEBOX',      'platform': ['windows', 'linux'],
    1.14  		                         'dir': 'hl2sdk-ob'}
    1.15 -		self.possibleSdks['css'] =   {'sdk': 'HL2SDKCSS',       'ext': '2.css',   'def': '6',
    1.16 +		self.possibleSdks['css'] =   {'sdk': 'HL2SDKCSS',       'ext': '2.css',     'def': '6',
    1.17  		                         'name': 'CSS',            'platform': ['windows', 'linux', 'darwin'],
    1.18  		                         'dir': 'hl2sdk-css'}
    1.19 -		self.possibleSdks['hl2dm'] = {'sdk': 'HL2SDKHL2DM',     'ext': '2.hl2dm', 'def': '7',
    1.20 +		self.possibleSdks['hl2dm'] = {'sdk': 'HL2SDKHL2DM',     'ext': '2.hl2dm',   'def': '7',
    1.21  		                         'name': 'HL2DM',          'platform': ['windows', 'linux', 'darwin'],
    1.22  		                         'dir': 'hl2sdk-hl2dm'}
    1.23 -		self.possibleSdks['dods'] =  {'sdk': 'HL2SDKDODS',      'ext': '2.dods',  'def': '8',
    1.24 +		self.possibleSdks['dods'] =  {'sdk': 'HL2SDKDODS',      'ext': '2.dods',    'def': '8',
    1.25  		                         'name': 'DODS',           'platform': ['windows', 'linux', 'darwin'],
    1.26  		                         'dir': 'hl2sdk-dods'}
    1.27 -		self.possibleSdks['tf2'] =   {'sdk': 'HL2SDKTF2',       'ext': '2.tf2',   'def': '9',
    1.28 +		self.possibleSdks['sdk2013'] =  {'sdk': 'HL2SDK2013',   'ext': '2.sdk2013', 'def': '9',
    1.29 +		                         'name': 'SDK2013',        'platform': ['windows', 'linux', 'darwin'],
    1.30 +		                         'dir': 'hl2sdk-2013'}
    1.31 +		self.possibleSdks['tf2'] =   {'sdk': 'HL2SDKTF2',       'ext': '2.tf2',     'def': '10',
    1.32  		                         'name': 'TF2',            'platform': ['windows', 'linux', 'darwin'],
    1.33  		                         'dir': 'hl2sdk-tf2'}
    1.34 -		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '10',
    1.35 +		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',     'def': '11',
    1.36  		                         'name': 'LEFT4DEAD',      'platform': ['windows', 'linux', 'darwin'],
    1.37  		                         'dir': 'hl2sdk-l4d'}
    1.38 -		self.possibleSdks['nd'] =    {'sdk': 'HL2SDKND',        'ext': '2.nd',    'def': '11',
    1.39 +		self.possibleSdks['nd'] =    {'sdk': 'HL2SDKND',        'ext': '2.nd',      'def': '12',
    1.40  		                         'name': 'NUCLEARDAWN',    'platform': ['windows', 'linux', 'darwin'],
    1.41  		                         'dir': 'hl2sdk-nd'}
    1.42 -		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '12',
    1.43 +		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',    'def': '13',
    1.44  		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux', 'darwin'],
    1.45  		                         'dir': 'hl2sdk-l4d2'}
    1.46 -		self.possibleSdks['darkm'] = {'sdk': 'HL2SDK-DARKM',    'ext': '2.darkm', 'def': '2',
    1.47 +		self.possibleSdks['darkm'] = {'sdk': 'HL2SDK-DARKM',    'ext': '2.darkm',   'def': '2',
    1.48  		                         'name': 'DARKMESSIAH',    'platform': ['windows'],
    1.49  		                          'dir': 'hl2sdk-darkm'}
    1.50 -		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '13',
    1.51 +		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm',   'def': '14',
    1.52  		                         'name': 'ALIENSWARM',     'platform': ['windows'],
    1.53  		                         'dir': 'hl2sdk-swarm'}
    1.54 -		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt',   'def': '4',
    1.55 +		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt',     'def': '4',
    1.56  		                         'name': 'BLOODYGOODTIME', 'platform': ['windows'],
    1.57  		                         'dir': 'hl2sdk-bgt'}
    1.58 -		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye',   'def': '5',
    1.59 +		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye',     'def': '5',
    1.60  		                         'name': 'EYE',            'platform': ['windows'],
    1.61  		                         'dir': 'hl2sdk-eye'}
    1.62 -		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',   'def': '15',
    1.63 +		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',     'def': '16',
    1.64  		                         'name': 'CSGO',           'platform': ['windows', 'linux', 'darwin'],
    1.65  		                         'dir': 'hl2sdk-csgo'}
    1.66 -		self.possibleSdks['dota'] =  {'sdk': 'HL2SDKDOTA',     'ext': '2.dota',   'def': '16',
    1.67 +		self.possibleSdks['dota'] =  {'sdk': 'HL2SDKDOTA',     'ext': '2.dota',     'def': '17',
    1.68  		                         'name': 'DOTA',           'platform': ['windows'],
    1.69  		                         'dir': 'hl2sdk-dota'}
    1.70 -		# self.possibleSdks['portal2'] =  {'sdk': 'HL2SDK-PORTAL2',     'ext': '2.portal2',  'def': '14',
    1.71 -		#                        'name': 'PORTAL2',           'platform': ['windows'],
    1.72 -		#                        'dir': 'hl2sdk-portal2'}
    1.73 +		self.possibleSdks['portal2'] = {'sdk': 'HL2SDKPORTAL2','ext': '2.portal2',  'def': '15',
    1.74 +		                         'name': 'PORTAL2',        'platform': [],
    1.75 +		                         'dir': 'hl2sdk-portal2'}
    1.76  		
    1.77  		self.sdkInfo = { }
    1.78  		
    1.79 @@ -266,41 +269,38 @@
    1.80  		if AMBuild.target['platform'] == 'linux':
    1.81  			if sdk == 'ep1':
    1.82  				staticLibs = os.path.join(sdkPath, 'linux_sdk')
    1.83 +			elif sdk == 'sdk2013':
    1.84 +				staticLibs = os.path.join(sdkPath, 'lib', 'public', 'linux32')
    1.85  			else:
    1.86  				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
    1.87  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
    1.88 +			libs = []
    1.89  			if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
    1.90  				libs = ['tier1_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
    1.91 -				for lib in libs:
    1.92 -					link = os.path.join(workFolder, lib)
    1.93 -					target = os.path.join(staticLibs, lib)
    1.94 -					try:
    1.95 -						os.lstat(link)
    1.96 -					except:
    1.97 -						job.AddCommand(SymlinkCommand(link, target))
    1.98  			elif sdk in ['l4d', 'nd', 'csgo']:
    1.99  				libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']
   1.100  				if sdk == 'csgo':
   1.101  					libs.insert(0, 'interfaces_i486.a')
   1.102 -				for lib in libs:
   1.103 -					link = os.path.join(workFolder, lib)
   1.104 -					target = os.path.join(staticLibs, lib)
   1.105 -					try:
   1.106 -						os.lstat(link)
   1.107 -					except:
   1.108 -						job.AddCommand(SymlinkCommand(link, target))
   1.109 +			elif sdk == 'sdk2013':
   1.110 +				libs = ['tier1.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
   1.111  			else:
   1.112 -				for i in ['tier1_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']:
   1.113 -					link = os.path.join(workFolder, i)
   1.114 -					target = os.path.join(staticLibs, i)
   1.115 -					try:
   1.116 -						os.lstat(link)
   1.117 -					except:
   1.118 -						job.AddCommand(SymlinkCommand(link, target))
   1.119 +				libs = ['tier1_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']
   1.120 +			
   1.121 +			for lib in libs:
   1.122 +				link = os.path.join(workFolder, lib)
   1.123 +				target = os.path.join(staticLibs, lib)
   1.124 +				try:
   1.125 +					os.lstat(link)
   1.126 +				except:
   1.127 +					job.AddCommand(SymlinkCommand(link, target))
   1.128  		elif AMBuild.target['platform'] == 'darwin':
   1.129 -			staticLibs = os.path.join(sdkPath, 'lib', 'mac')
   1.130 +			if sdk == 'sdk2013':
   1.131 +				staticLibs = os.path.join(sdkPath, 'lib', 'public', 'osx32')
   1.132 +				libs = ['tier1.a', 'libvstdlib.dylib', 'libtier0.dylib']
   1.133 +			else:
   1.134 +				staticLibs = os.path.join(sdkPath, 'lib', 'mac')
   1.135 +				libs = ['tier1_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
   1.136  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
   1.137 -			libs = ['tier1_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
   1.138  			if sdk == 'csgo':
   1.139  				libs.append('interfaces_i486.a')
   1.140  			for lib in libs:
   1.141 @@ -321,7 +321,11 @@
   1.142  
   1.143  	def PostSetupHL2Job(self, job, builder, sdk):
   1.144  		if AMBuild.target['platform'] in ['linux', 'darwin']:
   1.145 -			builder.AddObjectFiles(['tier1_i486.a'])
   1.146 +			if sdk == 'sdk2013':
   1.147 +				builder.AddObjectFiles(['tier1.a'])
   1.148 +			else:
   1.149 +				builder.AddObjectFiles(['tier1_i486.a'])
   1.150 +			
   1.151  			if( sdk in ['csgo', 'dota'] ):
   1.152  				builder.AddObjectFiles(['interfaces_i486.a'])
   1.153  
   1.154 @@ -334,10 +338,6 @@
   1.155  
   1.156  		info = self.possibleSdks
   1.157  		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
   1.158 -		
   1.159 -		# We don't build for Portal 2 (yet?, ever?), but using this define in code as 
   1.160 -		# it saves trouble if we ever need to
   1.161 -		compiler['CDEFINES'].append('SE_PORTAL2=14')
   1.162  
   1.163  		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
   1.164  						 ['public', 'tier0'], ['public', 'tier1']]
   1.165 @@ -353,29 +353,45 @@
   1.166  		sdkPath = AMBuild.cache[info['sdk']]
   1.167  
   1.168  		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
   1.169 +		
   1.170 +		if sdk == 'sdk2013' and isinstance(compiler.cxx, Cpp.CompatGCC):
   1.171 +			# The 2013 SDK already has these in public/tier0/basetypes.h
   1.172 +			compiler['CDEFINES'].remove('stricmp=strcasecmp')
   1.173 +			compiler['CDEFINES'].remove('_stricmp=strcasecmp')
   1.174 +			compiler['CDEFINES'].remove('_snprintf=snprintf')
   1.175 +			compiler['CDEFINES'].remove('_vsnprintf=vsnprintf')
   1.176  
   1.177  		if sdk in ['swarm', 'csgo', 'dota']:
   1.178  			if AMBuild.target['platform'] == 'windows':
   1.179  				compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
   1.180  			else:
   1.181  				compiler['CDEFINES'].extend(['COMPILER_GCC'])
   1.182 +		
   1.183 +		if sdk in ['css','hl2dm','dods','sdk2013','tf2','l4d2']:
   1.184 +			if AMBuild.target['platform'] == 'linux' or AMBuild.target['platform'] == 'darwin':
   1.185 +				compiler['CDEFINES'].append('NO_MALLOC_OVERRIDE')
   1.186  
   1.187 -		if sdk == 'ep1':
   1.188 -			if AMBuild.target['platform'] == 'linux':
   1.189 +		if AMBuild.target['platform'] == 'linux':
   1.190 +			if sdk == 'ep1':
   1.191  				staticLibs = os.path.join(sdkPath, 'linux_sdk')
   1.192 -		else:
   1.193 -			if AMBuild.target['platform'] == 'linux':
   1.194 +			elif sdk == 'sdk2013':
   1.195 +				staticLibs = os.path.join(sdkPath, 'lib', 'public', 'linux32')
   1.196 +			else:
   1.197  				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
   1.198 -			elif AMBuild.target['platform'] == 'darwin':
   1.199 +		elif AMBuild.target['platform'] == 'darwin':
   1.200 +			if sdk == 'sdk2013':
   1.201 +				staticLibs = os.path.join(sdkPath, 'lib', 'public', 'osx32')
   1.202 +			else:
   1.203  				staticLibs = os.path.join(sdkPath, 'lib', 'mac')
   1.204  
   1.205 +
   1.206  		for i in paths:
   1.207  			compiler['CXXINCLUDES'].append(os.path.join(sdkPath, *i))
   1.208  
   1.209  		if not noLink:
   1.210  			if AMBuild.target['platform'] == 'linux':
   1.211  				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
   1.212 -				if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
   1.213 +				if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'l4d2']:
   1.214  					compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
   1.215  					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
   1.216  				elif sdk in ['l4d', 'nd', 'csgo']: