Removed tag sourcemod-1.5.3

--HG--
extra : rebase_source : ae38cb50949e0be8f0f754832ee829adebc5a525

.hgtags

@@ -5,3 +5,7 @@ b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
 78a1f1b1c6fa86fd7691c70ebf48a9fb3dfb3c11 sourcemod-1.5.0
 5574bfe07731b7dba171c1300f6022319d2dbc89 sourcemod-1.5.1
+238c41726d73d9f0d65005ff43c1ab86adb0e163 sourcemod-1.5.2
+27bf76b007d2360a9cfc7af9e14d1c9a6bddcc64 sourcemod-1.5.3
+27bf76b007d2360a9cfc7af9e14d1c9a6bddcc64 sourcemod-1.5.3
+0000000000000000000000000000000000000000 sourcemod-1.5.3

AMBuildScript

@@ -1,499 +1,490 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python:
-import os
-import sys
-from ambuild.command import Command
-from ambuild.command import ShellCommand
-from ambuild.command import SymlinkCommand
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os, sys
 
-class ExtractDebugInfoCommand(Command):
-	def __init__(self, binary, outfile):
-		Command.__init__(self)
-		self.binary = binary
-		self.outfile = outfile
+class SDK(object):
+  def __init__(self, sdk, ext, aDef, name, platform, dir):
+    if dir == 'ep1':
+      folder = 'hl2sdk'
+    else:
+      folder = 'hl2sdk-' + dir
+    self.envvar = sdk
+    self.ext = ext
+    self.code = aDef
+    self.define = name
+    self.platform = platform
+    self.folder = folder # Default folder name.
+    self.name = dir
+    self.path = None # Actual path
 
-	def run(self, runner, job):
-		if AMBuild.cache['debug']:
-			return
+WinOnly = ['windows']
+WinLinux = ['windows', 'linux']
+WinLinuxMac = ['windows', 'linux', 'mac']
 
-		if not self.binary.NeedsRelink(self.outfile):
-			return
+PossibleSDKs = {
+  'ep1':  SDK('HL2SDK', '1.ep1', '1', 'EPISODEONE', WinLinux, 'ep1'),
+  'ep2':  SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'ob'),
+  'css':  SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
+  'hl2dm':  SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'),
+  'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'),
+  'tf2':  SDK('HL2SDKTF2', '2.tf2', '10', 'TF2', WinLinuxMac, 'tf2'),
+  'l4d':  SDK('HL2SDKL4D', '2.l4d', '11', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
+  'nd': SDK('HL2SDKND', '2.nd', '12', 'NUCLEARDAWN', WinLinuxMac, 'nd'),
+  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '13', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
+  'darkm':  SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
+  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '14', 'ALIENSWARM', WinOnly, 'swarm'),
+  'bgt':  SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
+  'eye':  SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
+  'csgo': SDK('HL2SDKCSGO', '2.csgo', '18', 'CSGO', WinLinuxMac, 'csgo'),
+  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '15', 'PORTAL2', [], 'portal2'),
 
-		if AMBuild.target['platform'] == 'linux':
-			job.AddCommand(ShellCommand('objcopy --only-keep-debug ' + self.outfile + ' ' + self.outfile + '.dbg'))
-			job.AddCommand(ShellCommand('objcopy --strip-debug ' + self.outfile))
-			job.AddCommand(ShellCommand('objcopy --add-gnu-debuglink=' + os.path.basename(self.outfile) + '.dbg ' + self.outfile))
-		elif AMBuild.target['platform'] == 'darwin':
-			job.AddCommand(ShellCommand('dsymutil ' + self.outfile))
-			job.AddCommand(ShellCommand('strip -S ' + self.outfile))
-
-class SM:
-	def __init__(self):
-		self.compiler = Cpp.Compiler()
-
-		#Build SDK info
-		self.possibleSdks = { }
-		self.possibleSdks['ep1'] =   {'sdk': 'HL2SDK',          'ext': '1.ep1',   'def': '1',
-		                         'name': 'EPISODEONE',     'platform': ['windows', 'linux'],
-		                         'dir': 'hl2sdk'}
-		self.possibleSdks['ep2'] =   {'sdk': 'HL2SDKOB',        'ext': '2.ep2',   'def': '3',
-		                         'name': 'ORANGEBOX',      'platform': ['windows', 'linux'],
-		                         'dir': 'hl2sdk-ob'}
-		self.possibleSdks['css'] =   {'sdk': 'HL2SDKCSS',       'ext': '2.css',   'def': '6',
-		                         'name': 'CSS',            'platform': ['windows', 'linux', 'darwin'],
-		                         'dir': 'hl2sdk-css'}
-		self.possibleSdks['hl2dm'] = {'sdk': 'HL2SDKHL2DM',     'ext': '2.hl2dm', 'def': '7',
-		                         'name': 'HL2DM',          'platform': ['windows', 'linux', 'darwin'],
-		                        'dir': 'hl2sdk-hl2dm'}
-		self.possibleSdks['dods'] =  {'sdk': 'HL2SDKDODS',      'ext': '2.dods',  'def': '8',
-		                         'name': 'DODS',           'platform': ['windows', 'linux', 'darwin'],
-		                        'dir': 'hl2sdk-dods'}
-		self.possibleSdks['tf2'] =   {'sdk': 'HL2SDKTF2',       'ext': '2.tf2',   'def': '9',
-		                         'name': 'TF2',            'platform': ['windows', 'linux', 'darwin'],
-		                        'dir': 'hl2sdk-tf2'}
-		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '10',
-		                         'name': 'LEFT4DEAD',      'platform': ['windows', 'linux', 'darwin'],
-		                         'dir': 'hl2sdk-l4d'}
-		self.possibleSdks['nd'] =    {'sdk': 'HL2SDKND',        'ext': '2.nd',    'def': '11',
-		                         'name': 'NUCLEARDAWN',    'platform': ['windows', 'linux', 'darwin'],
-		                         'dir': 'hl2sdk-nd'}
-		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '12',
-		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux', 'darwin'],
-		                         'dir': 'hl2sdk-l4d2'}
-		self.possibleSdks['darkm'] = {'sdk': 'HL2SDK-DARKM',    'ext': '2.darkm', 'def': '2',
-		                         'name': 'DARKMESSIAH',    'platform': ['windows'],
-		                          'dir': 'hl2sdk-darkm'}
-		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '13',
-		                         'name': 'ALIENSWARM',     'platform': ['windows'],
-		                         'dir': 'hl2sdk-swarm'}
-		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt',   'def': '4',
-		                         'name': 'BLOODYGOODTIME', 'platform': ['windows'],
-		                         'dir': 'hl2sdk-bgt'}
-		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye',   'def': '5',
-		                         'name': 'EYE',            'platform': ['windows'],
-		                         'dir': 'hl2sdk-eye'}
-		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',   'def': '15',
-		                         'name': 'CSGO',           'platform': ['windows', 'linux', 'darwin'],
-		                         'dir': 'hl2sdk-csgo'}
-		# self.possibleSdks['portal2'] =  {'sdk': 'HL2SDK-PORTAL2',     'ext': '2.portal2',  'def': '14',
-		#                        'name': 'PORTAL2',           'platform': ['windows'],
-		#                        'dir': 'hl2sdk-portal'}
-		
-		self.sdkInfo = { }
-
-		if AMBuild.mode == 'config':
-			#Detect compilers
-			self.compiler.DetectAll(AMBuild)
-			
-			self.hasMySql = AMBuild.options.hasMySql
-			AMBuild.cache.CacheVariable('hasMySql', self.hasMySql)
-
-			AMBuild.cache.CacheVariable('debug', AMBuild.options.debug)
-			
-			#Environment variable paths to external headers
-			envvars = { 'MMSOURCE110': 'mmsource-1.10', 'MYSQL5': 'mysql-5.0' }
-			
-			#Look for Metamod:Source and MySQL if not disabled
-			for env in envvars:
-				if not self.hasMySql and env == 'MYSQL5':
-					continue
-				path = self.ResolveEnvPath(env, envvars[env])
-				if path == None:
-					raise Exception('Could not find a valid path for {0}'.format(env))
-				AMBuild.cache.CacheVariable(env, path)
-			
-			#Look for SDK directories
-			for sdk in self.possibleSdks:
-				#Get list of SDKs to build against or 'all' or 'present'
-				sdkList = AMBuild.options.sdks.split(',')
-				#Build against all supported SDKs?
-				useAll = sdkList[0] == 'all'
-				#Build against supported SDKs that exist?
-				usePresent = sdkList[0] == 'present'
-
-				info = self.possibleSdks[sdk]
-				if AMBuild.target['platform'] in info['platform']:
-					env = info['sdk']
-					dir = info['dir']
-					sdkPath = self.ResolveEnvPath(env, dir)
-					if sdkPath == None:
-						if useAll or sdk in sdkList:
-							raise Exception('Could not find a valid path for {0}'.format(env))
-						else:
-							continue
-					if useAll or usePresent or sdk in sdkList:
-						self.sdkInfo[sdk] = info
-						AMBuild.cache.CacheVariable(env, sdkPath)
-
-			if len(self.sdkInfo) < 1:
-				raise Exception('At least one SDK must be available.')
-				
-			AMBuild.cache.CacheVariable('sdkInfo', self.sdkInfo)
-
-			#Set up defines
-			cxx = self.compiler.cxx
-			if isinstance(cxx, Cpp.CompatGCC):
-				if isinstance(cxx, Cpp.GCC):
-					self.vendor = 'gcc'
-				elif isinstance(cxx, Cpp.Clang):
-					self.vendor = 'clang'
-				self.compiler.AddToListVar('CDEFINES', 'stricmp=strcasecmp')
-				self.compiler.AddToListVar('CDEFINES', '_stricmp=strcasecmp')
-				self.compiler.AddToListVar('CDEFINES', '_snprintf=snprintf')
-				self.compiler.AddToListVar('CDEFINES', '_vsnprintf=vsnprintf')
-				self.compiler.AddToListVar('CFLAGS', '-pipe')
-				self.compiler.AddToListVar('CFLAGS', '-fno-strict-aliasing')
-				if (self.vendor == 'gcc' and cxx.majorVersion >= 4) or self.vendor == 'clang':
-					self.compiler.AddToListVar('CFLAGS', '-fvisibility=hidden')
-					self.compiler.AddToListVar('CXXFLAGS', '-fvisibility-inlines-hidden')
-				self.compiler.AddToListVar('CFLAGS', '-Wall')
-				self.compiler.AddToListVar('CFLAGS', '-Werror')
-				self.compiler.AddToListVar('CFLAGS', '-Wno-uninitialized')
-				self.compiler.AddToListVar('CFLAGS', '-Wno-unused')
-				self.compiler.AddToListVar('CFLAGS', '-Wno-switch')
-				self.compiler.AddToListVar('CFLAGS', '-msse')
-				self.compiler.AddToListVar('CFLAGS', '-g3')
-				self.compiler.AddToListVar('CFLAGS', '-m32')
-				self.compiler.AddToListVar('POSTLINKFLAGS', '-m32')
-				self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions')
-				self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
-				self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
-				self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual')
-				if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 7) or \
-						(self.vendor == 'clang' and cxx.majorVersion >= 3):
-					self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor')
-				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
-				self.compiler.AddToListVar('CDEFINES', 'GNUC')
-				if self.vendor == 'gcc':
-					self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
-			elif isinstance(cxx, Cpp.MSVC):
-				self.vendor = 'msvc'
-				if AMBuild.options.debug == '1':
-					self.compiler.AddToListVar('CFLAGS', '/MTd')
-					self.compiler.AddToListVar('POSTLINKFLAGS', '/NODEFAULTLIB:libcmt')
-				else:
-					self.compiler.AddToListVar('CFLAGS', '/MT')
-				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE')
-				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS')
-				self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE')
-				self.compiler.AddToListVar('CXXFLAGS', '/EHsc')
-				self.compiler.AddToListVar('CXXFLAGS', '/GR-')
-				self.compiler.AddToListVar('CFLAGS', '/W3')
-				self.compiler.AddToListVar('CFLAGS', '/nologo')
-				self.compiler.AddToListVar('CFLAGS', '/Zi')
-				self.compiler.AddToListVar('CXXFLAGS', '/TP')
-				self.compiler.AddToListVar('POSTLINKFLAGS', '/DEBUG')
-				self.compiler.AddToListVar('POSTLINKFLAGS', '/MACHINE:X86')
-				self.compiler.AddToListVar('POSTLINKFLAGS', '/SUBSYSTEM:WINDOWS')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'kernel32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'user32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'gdi32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'winspool.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'comdlg32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'advapi32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'shell32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'ole32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'oleaut32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'uuid.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'odbc32.lib')
-				self.compiler.AddToListVar('POSTLINKFLAGS', 'odbccp32.lib')
-
-			#Optimization
-			if AMBuild.options.opt == '1':
-				self.compiler.AddToListVar('CDEFINES', 'NDEBUG')
-				if self.vendor == 'gcc' or self.vendor == 'clang':
-					self.compiler.AddToListVar('CFLAGS', '-O3')
-				elif self.vendor == 'msvc':
-					self.compiler.AddToListVar('CFLAGS', '/Ox')
-					self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:ICF')
-					self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:REF')
-
-			#Debugging
-			if AMBuild.options.debug == '1':
-				self.compiler.AddToListVar('CDEFINES', 'DEBUG')
-				self.compiler.AddToListVar('CDEFINES', '_DEBUG')
-				if self.vendor == 'msvc':
-					self.compiler.AddToListVar('CFLAGS', '/Od')
-					self.compiler.AddToListVar('CFLAGS', '/RTC1')
-			
-			#This needs to be after our optimization flags which could otherwise disable it.
-			if self.vendor == 'msvc':
-				# Don't omit frame pointer
-				self.compiler.AddToListVar('CFLAGS', '/Oy-')
-
-			#Platform-specifics
-			if AMBuild.target['platform'] == 'linux':
-				self.compiler.AddToListVar('CDEFINES', '_LINUX')
-				self.compiler.AddToListVar('CDEFINES', 'POSIX')
-				if self.vendor == 'gcc':
-					self.compiler.AddToListVar('POSTLINKFLAGS', '-static-libgcc')
-				if self.vendor == 'clang':
-					self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
-			elif AMBuild.target['platform'] == 'darwin':
-				self.compiler.AddToListVar('CDEFINES', 'OSX')
-				self.compiler.AddToListVar('CDEFINES', '_OSX')
-				self.compiler.AddToListVar('CDEFINES', 'POSIX')
-				self.compiler.AddToListVar('POSTLINKFLAGS', '-mmacosx-version-min=10.5')
-				self.compiler.AddToListVar('POSTLINKFLAGS', ['-arch', 'i386'])
-				self.compiler.AddToListVar('POSTLINKFLAGS', '-lstdc++')
-
-				# For OS X dylib versioning
-				import re
-				productFile = open(os.path.join(AMBuild.sourceFolder, 'product.version'), 'r')
-				productContents = productFile.read()
-				productFile.close()
-				m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
-				if m == None:
-					self.version = '1.0.0'
-				else:
-					major, minor, release = m.groups()
-					self.version = '{0}.{1}.{2}'.format(major, minor, release)
-				AMBuild.cache.CacheVariable('version', self.version)
-			elif AMBuild.target['platform'] == 'windows':
-				self.compiler.AddToListVar('CDEFINES', 'WIN32')
-				self.compiler.AddToListVar('CDEFINES', '_WINDOWS')
-
-			#Finish up
-			self.compiler.AddToListVar('CDEFINES', 'SOURCEMOD_BUILD')
-			self.compiler.AddToListVar('CDEFINES', 'SM_GENERATED_BUILD')
-			self.compiler.AddToListVar('CINCLUDES',
-			                           os.path.join(AMBuild.outputFolder, 'includes'))
-			self.compiler.ToConfig(AMBuild, 'compiler')
-			AMBuild.cache.CacheVariable('vendor', self.vendor)
-			self.targetMap = { }
-			AMBuild.cache.CacheVariable('targetMap', self.targetMap)
-		else:
-			self.sdkInfo = AMBuild.cache['sdkInfo']
-			self.compiler.FromConfig(AMBuild, 'compiler')
-			self.targetMap = AMBuild.cache['targetMap']
-			self.hasMySql = AMBuild.cache['hasMySql']
-
-		if AMBuild.target['platform'] == 'windows':
-			self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
-			self.compiler.AddToListVar('RCINCLUDES',
-			                           os.path.join(AMBuild.outputFolder, 'includes'))
-		self.mmsPath = AMBuild.cache['MMSOURCE110']
-
-	def DefaultCompiler(self):
-		return self.compiler.Clone()
-
-	def JobMatters(self, jobname):
-		file = sys._getframe().f_code.co_filename
-		if AMBuild.mode == 'config':
-			self.targetMap[jobname] = file
-			return True
-		if len(AMBuild.args) == 0:
-			return True
-		if not jobname in AMBuild.args:
-			return False
-
-	def DefaultExtCompiler(self, path):
-		compiler = self.DefaultCompiler()
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path, 'sdk'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'extensions'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn'))
-		return compiler
-
-	def AutoVersion(self, folder, binary):
-		if AMBuild.target['platform'] == 'windows':
-			env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
-			binary.AddResourceFile(os.path.join(folder, 'version.rc' ), env)
-		elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder):
-			binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0'])
-			binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']])
-		else:
-			return
-
-	def ExtractDebugInfo(self, job, binary):
-		src = os.path.join('..', AMBuild.outputFolder, job.workFolder, binary.binaryFile)
-		job.AddCommand(ExtractDebugInfoCommand(binary, src))
-
-	def PreSetupHL2Job(self, job, builder, sdk):
-		info = self.sdkInfo[sdk]
-		sdkPath = AMBuild.cache[info['sdk']]
-		if AMBuild.target['platform'] == 'linux':
-			if sdk == 'ep1':
-				staticLibs = os.path.join(sdkPath, 'linux_sdk')
-			else:
-				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
-			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
-				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
-				for lib in libs:
-					link = os.path.join(workFolder, lib)
-					target = os.path.join(staticLibs, lib)
-					try:
-						os.lstat(link)
-					except:
-						job.AddCommand(SymlinkCommand(link, target))
-			elif sdk in ['l4d', 'nd', 'csgo']:
-				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']
-				if sdk == 'csgo':
-					libs.append('interfaces_i486.a')
-				for lib in libs:
-					link = os.path.join(workFolder, lib)
-					target = os.path.join(staticLibs, lib)
-					try:
-						os.lstat(link)
-					except:
-						job.AddCommand(SymlinkCommand(link, target))
-			else:
-				libs = ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']
-				for lib in libs:
-					link = os.path.join(workFolder, lib)
-					target = os.path.join(staticLibs, lib)
-					try:
-						os.lstat(link)
-					except:
-						job.AddCommand(SymlinkCommand(link, target))
-		elif AMBuild.target['platform'] == 'darwin':
-			staticLibs = os.path.join(sdkPath, 'lib', 'mac')
-			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
-			if sdk == 'csgo':
-				libs.append('interfaces_i486.a')
-			for lib in libs:
-				link = os.path.join(workFolder, lib)
-				target = os.path.join(staticLibs, lib)
-				try:
-					os.lstat(link)
-				except:
-					job.AddCommand(SymlinkCommand(link, target))
-		elif AMBuild.target['platform'] == 'windows':
-			libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
-			if sdk in ['swarm', 'csgo']:
-				libs.append('interfaces')
-			for lib in libs:
-				libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
-				builder.RebuildIfNewer(libPath)
-				builder['POSTLINKFLAGS'].append(libPath)
-
-	def PostSetupHL2Job(self, job, builder, sdk):
-		if AMBuild.target['platform'] in ['linux', 'darwin']:
-			builder.AddObjectFiles(['tier1_i486.a', 'mathlib_i486.a'])
-			if sdk == 'csgo':
-				builder.AddObjectFiles(['interfaces_i486.a'])
-	
-	def DefaultHL2Compiler(self, path, sdk, noLink = False, oldMms = '-legacy'):
-		compiler = self.DefaultExtCompiler(path)
-
-		mms = 'core'
-		if sdk == 'ep1':
-			mms += oldMms
-
-		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms))
-		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms, 'sourcehook'))
-
-		info = self.possibleSdks
-		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
-				
-		# We don't build for Portal 2 (yet?, ever?), but using this define in code as 
-		# it saves trouble if we ever need to
-		compiler['CDEFINES'].append('SE_PORTAL2=14')
-
-		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
-						 ['public', 'tier0'], ['public', 'tier1']]
-		if sdk == 'ep1' or sdk == 'darkm':
-			paths.append(['public', 'dlls'])
-			paths.append(['game_shared'])
-		else:
-			paths.append(['public', 'game', 'server'])
-			paths.append(['public', 'toolframework'])
-			paths.append(['game', 'shared'])
-			paths.append(['common'])
-
-		info = self.sdkInfo[sdk]
-		sdkPath = AMBuild.cache[info['sdk']]
-
-		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
-
-		if sdk in ['swarm','csgo']:
-			if AMBuild.target['platform'] == 'windows':
-				compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
-			else:
-				compiler['CDEFINES'].extend(['COMPILER_GCC'])
-
-		if sdk == 'ep1':
-			if AMBuild.target['platform'] == 'linux':
-				staticLibs = os.path.join(sdkPath, 'linux_sdk')
-		else:
-			if AMBuild.target['platform'] == 'linux':
-				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
-			elif AMBuild.target['platform'] == 'darwin':
-				staticLibs = os.path.join(sdkPath, 'lib', 'mac')
-
-		for i in paths:
-			compiler['CXXINCLUDES'].append(os.path.join(sdkPath, *i))
-
-		if not noLink:
-			if AMBuild.target['platform'] == 'linux':
-				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
-				if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
-					compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
-					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
-				elif sdk in ['l4d', 'nd', 'csgo']:
-					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
-					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
-				else:
-					compiler['POSTLINKFLAGS'][0:0] = ['tier0_i486.so']
-					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so']
-			elif AMBuild.target['platform'] == 'darwin':
-				compiler['POSTLINKFLAGS'][0:0] = ['libtier0.dylib']
-				compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.dylib']
-
-		return compiler
-		
-	def ResolveEnvPath(self, env, defaultDir):
-		if env in os.environ:
-			path = os.environ[env]
-			if os.path.isdir(path):
-				return path
-		else:
-			head = os.getcwd()
-			oldhead = None
-			while head != None and head != oldhead:
-				path = os.path.join(head, defaultDir)
-				if os.path.isdir(path):
-					return path
-				oldhead = head
-				head, tail = os.path.split(head)
-		return None
-
-sm = SM()
-globals = {
-	'SM': sm
+#  These engines are only supported on SourceMod 1.6.
+#  'blade':  SDK('HL2SDKBLADE', '2.blade', '16', 'BLADE', WinLinux, 'blade'),
+#  'dota': SDK('HL2SDKDOTA', '2.dota', '19', 'DOTA', WinOnly, 'dota'),
+#  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '17', 'INSURGENCY', WinLinuxMac, 'insurgency'),
+#  'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, '2013'),
 }
 
-AMBuild.Include(os.path.join('tools', 'buildbot', 'Versioning'), globals)
+def ResolveEnvPath(env, folder):
+  if env in os.environ:
+    path = os.environ[env]
+    if os.path.isdir(path):
+      return path
+  else:
+    head = os.getcwd()
+    oldhead = None
+    while head != None and head != oldhead:
+      path = os.path.join(head, folder)
+      if os.path.isdir(path):
+        return path
+      oldhead = head
+      head, tail = os.path.split(head)
+  return None
 
-FileList = [
-		['loader', 'AMBuilder'],
-		['core', 'AMBuilder'],
-		['core', 'logic', 'AMBuilder'],
-		['extensions', 'bintools', 'AMBuilder'],
-		['extensions', 'clientprefs', 'AMBuilder'],
-		['extensions', 'cstrike', 'AMBuilder'],
-		['extensions', 'curl', 'AMBuilder'],
-		['extensions', 'geoip', 'AMBuilder'],
-		['extensions', 'mysql', 'AMBuilder'],
-		['extensions', 'sdkhooks', 'AMBuilder'],
-		['extensions', 'sdktools', 'AMBuilder'],
-		['extensions', 'topmenus', 'AMBuilder'],
-		['extensions', 'updater', 'AMBuilder'],
-		['extensions', 'sqlite', 'AMBuilder'],
-		['extensions', 'regex', 'AMBuilder'],
-		['extensions', 'tf2', 'AMBuilder'],
-		['sourcepawn', 'jit', 'AMBuilder'],
-		['sourcepawn', 'compiler', 'AMBuilder'],
-		['plugins', 'AMBuilder'],
-		['tools', 'buildbot', 'PackageScript'],
-		['tools', 'buildbot', 'BreakpadSymbols']
-	]
+class SMConfig(object):
+  def __init__(self):
+    self.sdks = {}
+    self.binaries = []
+    self.extensions = []
+    self.generated_headers = None
+    self.mms_root = None
+    self.mysql_root = None
+    self.spcomp = None
+    self.smx_files = {}
+    self.versionlib = None
 
-if not sm.hasMySql:
-	FileList.remove(['extensions', 'mysql', 'AMBuilder'])
+  def detectProductVersion(self):
+    builder.AddConfigureFile('product.version')
 
-for parts in FileList:
-	AMBuild.Include(os.path.join(*parts), globals)
+    # For OS X dylib versioning
+    import re
+    with open(os.path.join(builder.sourcePath, 'product.version'), 'r') as fp:
+      productContents = fp.read()
+    m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
+    if m == None:
+      self.productVersion = '1.0.0'
+    else:
+      major, minor, release = m.groups()
+      self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
 
+  def detectSDKs(self):
+    sdk_list = builder.options.sdks.split(',')
+    use_all = sdk_list[0] == 'all'
+    use_present = sdk_list[0] == 'present'
+
+    for sdk_name in PossibleSDKs:
+      sdk = PossibleSDKs[sdk_name]
+      if builder.target_platform in sdk.platform:
+        sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder)
+        if sdk_path is None:
+          if use_all or sdk_name in sdk_list:
+            raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
+          continue
+        if use_all or use_present or sdk_name in sdk_list:
+          sdk.path = sdk_path
+          self.sdks[sdk_name] = sdk
+
+    if len(self.sdks) < 1:
+      raise Exception('At least one SDK must be available.')
+
+    self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
+    if not self.mms_root:
+      self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
+      if not self.mms_root:
+        raise Exception('Could not find a source copy of Metamod:Source')
+
+    if builder.options.hasMySql:
+      for i in range(7):
+        self.mysql_root = ResolveEnvPath('MYSQL5', 'mysql-5.' + str(i))
+        if self.mysql_root:
+          break
+      if not self.mysql_root:
+        raise Exception('Could not find a path to MySQL!')
+
+  def configure(self):
+    builder.AddConfigureFile('pushbuild.txt')
+
+    cfg = builder.DetectCompilers()
+    cxx = cfg.cxx
+
+    if cxx.behavior == 'gcc':
+      cfg.defines += [
+        'stricmp=strcasecmp',
+        '_stricmp=strcasecmp',
+        '_snprintf=snprintf',
+        '_vsnprintf=vsnprintf',
+        'HAVE_STDINT_H',
+        'GNUC',
+      ]
+      cfg.cflags += [
+        '-pipe',
+        '-fno-strict-aliasing',
+        '-Wall',
+        '-Werror',
+        '-Wno-uninitialized',
+        '-Wno-unused',
+        '-Wno-switch',
+        '-msse',
+        '-m32',
+      ]
+
+      have_gcc = cxx.name == 'gcc'
+      have_clang = cxx.name == 'clang'
+      if have_clang or (have_gcc and cxx.majorVersion >= 4):
+        cfg.cflags += ['-fvisibility=hidden']
+        cfg.cxxflags += ['-fvisibility-inlines-hidden']
+        if have_clang or (have_gcc and cxx.minorVersion >= 6):
+          cfg.cflags += ['-Wno-narrowing']
+        if (have_gcc and cxx.minorVersion >= 7) or (have_clang and cxx.majorVersion >= 3):
+          cfg.cxxflags += ['-Wno-delete-non-virtual-dtor']
+
+      if have_gcc:
+        cfg.cflags += ['-Wno-parentheses']
+      elif have_clang:
+        cfg.cflags += ['-Wno-logical-op-parentheses']
+
+      cfg.linkflags += ['-m32']
+      cfg.cxxflags += [
+        '-fno-exceptions',
+        '-fno-threadsafe-statics',
+        '-Wno-non-virtual-dtor',
+        '-Wno-overloaded-virtual',
+      ]
+
+      if have_gcc:
+        cfg.cflags += ['-mfpmath=sse']
+    elif cxx.name == 'msvc':
+      if builder.options.debug == '1':
+        cfg.cflags += ['/MTd']
+        cfg.linkflags += ['/NODEFAULTLIB:libcmt']
+      else:
+        cfg.cflags += ['/MT']
+      cfg.defines += [
+        '_CRT_SECURE_NO_DEPRECATE',
+        '_CRT_SECURE_NO_WARNINGS',
+        '_CRT_NONSTDC_NO_DEPRECATE',
+        '_ITERATOR_DEBUG_LEVEL=0',
+      ]
+      cfg.cflags += [
+        '/W3',
+      ]
+      cfg.cxxflags += [
+        '/EHsc',
+        '/GR-',
+        '/TP',
+      ]
+      cfg.linkflags += [
+        '/MACHINE:X86',
+        '/SUBSYSTEM:WINDOWS',
+        'kernel32.lib',
+        'user32.lib',
+        'gdi32.lib',
+        'winspool.lib',
+        'comdlg32.lib',
+        'advapi32.lib',
+        'shell32.lib',
+        'ole32.lib',
+        'oleaut32.lib',
+        'uuid.lib',
+        'odbc32.lib',
+        'odbccp32.lib',
+      ] 
+
+    # Optimization
+    if builder.options.opt == '1':
+      cfg.defines += ['NDEBUG']
+      if cxx.behavior == 'gcc':
+        cfg.cflags += ['-O3']
+      elif cxx.behavior == 'msvc':
+        cfg.cflags += ['/Ox']
+        cfg.linkflags += ['/OPT:ICF', '/OPT:REF']
+
+    # Debugging
+    if builder.options.debug == '1':
+      cfg.defines += ['DEBUG', '_DEBUG']
+      if cxx.behavior == 'msvc':
+        cfg.cflags += ['/Od', '/RTC1']
+        if int(cxx.version) >= 1600:
+          cfg.cflags += ['/d2Zi+']
+
+    # This needs to be after our optimization flags which could otherwise disable it.
+    if cxx.name == 'msvc':
+      # Don't omit the frame pointer.
+      cfg.cflags += ['/Oy-']
+
+    # Platform-specifics
+    if builder.target_platform == 'linux':
+      cfg.defines += ['_LINUX', 'POSIX']
+      if cxx.name == 'gcc':
+        cfg.linkflags += ['-static-libgcc']
+      elif cxx.name == 'clang':
+        cfg.linkflags += ['-lgcc_eh']
+    elif builder.target_platform == 'mac':
+      cfg.defines += ['OSX', '_OSX', 'POSIX']
+      cfg.cflags += ['-mmacosx-version-min=10.5']
+      cfg.linkflags += [
+        '-mmacosx-version-min=10.5',
+        '-arch', 'i386',
+        '-lstdc++',
+        '-stdlib=libstdc++',
+      ]
+      cfg.cxxflags += ['-stdlib=libstdc++']
+    elif builder.target_platform == 'windows':
+      cfg.defines += ['WIN32', '_WINDOWS']
+
+    # Finish up.
+    cfg.defines += [
+      'SOURCEMOD_BUILD',
+      'SM_GENERATED_BUILD',
+      'SM_USE_VERSIONLIB',
+    ]
+    cfg.includes += [os.path.join(builder.buildPath, 'includes')]
+    cfg.includes += [os.path.join(builder.sourcePath, 'versionlib')]
+
+  def LibraryBuilder(self, compiler, name):
+    binary = compiler.Library(name)
+    if builder.target_platform == 'windows':
+      binary.sources += ['version.rc']
+      binary.compiler.rcdefines += [
+        'BINARY_NAME="{0}"'.format(binary.outputFile),
+        'SM_GENERATED_BUILD',
+        'RC_COMPILE',
+      ]
+    elif builder.target_platform == 'mac':
+      binary.compiler.postlink += [
+        '-compatibility_version', '1.0.0',
+        '-current_version', self.productVersion
+      ]
+    binary.compiler.linkflags += [self.versionlib]
+    binary.compiler.sourcedeps += SM.generated_headers
+    return binary
+
+  def ProgramBuilder(self, compiler, name):
+    binary = compiler.Program(name)
+    if builder.target_platform == 'windows':
+      binary.sources += ['version.rc']
+      binary.compiler.rcdefines += [
+        'BINARY_NAME="{0}"'.format(binary.outputFile),
+        'SM_GENERATED_BUILD',
+        'RC_COMPILE',
+      ]
+    binary.compiler.linkflags += [self.versionlib]
+    binary.compiler.sourcedeps += SM.generated_headers
+    return binary
+
+  def Library(self, context, name):
+    compiler = context.compiler.clone()
+    return self.LibraryBuilder(compiler, name)
+
+  def Program(self, context, name):
+    compiler = context.compiler.clone()
+    return self.ProgramBuilder(compiler, name)
+
+  def ExtCompiler(self, context):
+    compiler = context.compiler.clone()
+    compiler.cxxincludes += [
+      os.path.join(context.currentSourcePath),
+      os.path.join(context.currentSourcePath, 'sdk'),
+      os.path.join(builder.sourcePath, 'public'),
+      os.path.join(builder.sourcePath, 'public', 'extensions'),
+      os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
+      os.path.join(builder.sourcePath, 'public', 'amtl'),
+    ]
+    return compiler
+
+  def HL2Compiler(self, context, sdk):
+    compiler = self.ExtCompiler(context)
+
+    if sdk.name == 'ep1':
+      mms_path = os.path.join(self.mms_root, 'core-legacy')
+    else:
+      mms_path = os.path.join(self.mms_root, 'core')
+
+    compiler.cxxincludes += [
+      os.path.join(mms_path),
+      os.path.join(mms_path, 'sourcehook'),
+    ]
+
+    defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
+    compiler.defines += defines
+    paths = [
+      ['public'],
+      ['public', 'engine'],
+      ['public', 'mathlib'],
+      ['public', 'vstdlib'],
+      ['public', 'tier0'],
+      ['public', 'tier1']
+    ]
+    if sdk.name == 'ep1' or sdk.name == 'darkm':
+      paths.append(['public', 'dlls'])
+      paths.append(['game_shared'])
+    else:
+      paths.append(['public', 'game', 'server'])
+      paths.append(['public', 'toolframework'])
+      paths.append(['game', 'shared'])
+      paths.append(['common'])
+
+    compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
+
+    if sdk.name == '2013' and compiler.cxx.behavior == 'gcc':
+      # The 2013 SDK already has these in public/tier0/basetypes.h
+      compiler.defines.remove('stricmp=strcasecmp')
+      compiler.defines.remove('_stricmp=strcasecmp')
+      compiler.defines.remove('_snprintf=snprintf')
+      compiler.defines.remove('_vsnprintf=vsnprintf')
+
+    if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
+      if compiler.cc.behavior == 'msvc':
+        compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32']
+      else:
+        compiler.defines += ['COMPILER_GCC']
+	
+	# For everything after Swarm, this needs to be defined for entity networking
+	# to work properly with sendprop value changes.
+    if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']:
+      compiler.defines += ['NETWORK_VARS_ENABLED']
+
+    if sdk.name in ['css', 'hl2dm', 'dods', '2013', 'tf2', 'l4d2']:
+      if builder.target_platform in ['linux', 'mac']:
+        compiler.defines += ['NO_MALLOC_OVERRIDE']
+
+    for path in paths:
+      compiler.cxxincludes += [os.path.join(sdk.path, *path)]
+
+    return compiler
+
+  def ExtLibrary(self, context, name):
+    compiler = self.ExtCompiler(context)
+    return self.LibraryBuilder(compiler, name)
+
+  def HL2Library(self, context, name, sdk):
+    compiler = self.HL2Compiler(context, sdk)
+
+    if builder.target_platform == 'linux':
+      if sdk.name == 'ep1':
+        lib_folder = os.path.join(sdk.path, 'linux_sdk')
+      elif sdk.name == '2013':
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'linux')
+    elif builder.target_platform == 'mac':
+      if sdk.name == '2013':
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'mac')
+
+    if builder.target_platform in ['linux', 'mac']:
+      if sdk.name == '2013':
+        compiler.postlink += [
+          compiler.Dep(os.path.join(lib_folder, 'tier1.a')),
+          compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))
+        ]
+      else:
+        compiler.postlink += [
+          compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a')),
+          compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a'))
+        ]
+
+      if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']:
+        compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
+
+    binary = self.LibraryBuilder(compiler, name)
+
+    dynamic_libs = []
+    if builder.target_platform == 'linux':
+      compiler.linkflags[0:0] = ['-lm']
+      if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', '2013', 'l4d2']:
+        dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
+      elif sdk.name in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']:
+        dynamic_libs = ['libtier0.so', 'libvstdlib.so']
+      else:
+        dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
+    elif builder.target_platform == 'mac':
+      binary.compiler.linkflags.append('-liconv')
+      dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
+    elif builder.target_platform == 'windows':
+      libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
+      if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
+        libs.append('interfaces')
+      for lib in libs:
+        lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
+        binary.compiler.linkflags.append(binary.Dep(lib_path))
+
+    for library in dynamic_libs:
+      source_path = os.path.join(lib_folder, library)
+      output_path = os.path.join(binary.localFolder, library)
+
+      def make_linker(source_path, output_path):
+        def link(context, binary):
+          cmd_node, (output,) = context.AddSymlink(source_path, output_path)
+          return output
+        return link
+
+      linker = make_linker(source_path, output_path)
+      binary.compiler.linkflags[0:0] = [binary.Dep(library, linker)]
+
+    return binary
+
+SM = SMConfig()
+SM.detectProductVersion()
+SM.detectSDKs()
+SM.configure()
+
+SM.generated_headers = builder.RunScript(
+  'tools/buildbot/Versioning',
+  { 'SM': SM }
+)
+SM.versionlib = builder.RunScript(
+  'versionlib/AMBuilder',
+  { 'SM': SM }
+)
+
+builder.RunBuildScripts(
+  [
+    'loader/AMBuilder',
+    'core/AMBuilder',
+    'core/logic/AMBuilder',
+    'extensions/bintools/AMBuilder',
+    'extensions/clientprefs/AMBuilder',
+    'extensions/curl/AMBuilder',
+    'extensions/cstrike/AMBuilder',
+    'extensions/geoip/AMBuilder',
+    'extensions/mysql/AMBuilder',
+    'extensions/regex/AMBuilder',
+    'extensions/sdkhooks/AMBuilder',
+    'extensions/sdktools/AMBuilder',
+    'extensions/sqlite/AMBuilder',
+    'extensions/tf2/AMBuilder',
+    'extensions/topmenus/AMBuilder',
+    'extensions/updater/AMBuilder',
+    'sourcepawn/compiler/AMBuilder',
+    'sourcepawn/jit/AMBuilder',
+    'plugins/AMBuilder',
+    'tools/buildbot/PackageScript',
+  ],
+  {
+    'SM': SM
+  }
+)
+
+if builder.options.breakpad_dump:
+  builder.RunScript('tools/buildbot/BreakpadSymbols', { 'SM': SM })

changelog.txt

@@ -1,5 +1,45 @@
 SourceMod Changelog
 
+SourceMod 1.5.3 [2014-03-22]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.5.3_Release_Notes
+
+User Changes:
+ - Updated support for CS:GO after multiple breaking game updates.
+ - Updated gamedata support for GoldenEye: Source (Peace-Maker).
+ - Fixed crash on SDKHooks extension load in Alien Swarm (bug 6059).
+ - Fixed memory leak from unmanaged forwards never being freed (bug 6025).
+ - Fixed possible crash when unloading the CStrike extension.
+ - Fixed crash in SDKHooks Reload post-hook (Peace-Maker).
+ - Fixed FakeClientCommandEx always leaking memory (bug 5678).
+ - Fixed extra entity networking occuring with SetEntProp natives on some games.
+ - Fixed being able to nominate same map multiple times (bug 5109).
+ - Fixed spurious FindEntityByClassname error being logged on some games and platforms.
+ - Fixed an Anti-Flood bypass exploit (bug 5394).
+ - Removed part of Addresses gamedata error handling which could cause false errors to be logged (bug 6044).
+ - Fixed mapchooser not resetting nominations count when clearing nominations list (bug 5359).
+ - Improved performances of client convar query handling (bug 6003).
+
+Developer Changes:
+ - Added GiveAmmo native to SDKTools (bug 6039) (Peace-Maker).
+ - Added SQL_SetCharset native to (re)set charset even after reconnect (bug 5786) (Peace-Maker).
+ - Added support for entity references in SDKHooks natives (bug 6069).
+ - Added support for server passwords to DisplayAskConnectBox stock (bug 5984) (FlaminSarge).
+ - Renamed SortFunc2D parameters to match documentation (bug 6014) (Peace-Maker).
+ - Fixed param order in AddToTopMenu function doc (bug 6035) (Peace-Maker).
+ - Added |any| tag to WritePackCell and ReadPackCell native param/return values (bug 6001).
+ - Updated SDKHook_TakeDamage native for game updates.
+ - Added default infinite value for TF2_AddCondition duration.
+ - Added support for conditions >= 64 in TF2_OnConditionAdded/Removed (bug 5565, bug 5976) (FlaminSarge).
+ - Updated TFCond and TF customkill enum values (bug 6012) (FlaminSarge).
+ - Fixed regression causing incorrect return and inability to block in TF2_OnCalcIsAttackCritical forward.
+ - Fixed TE_* natives operating on incorrect data for some tempents (bug 6072).
+ - Fixed CS_AliasToWeaponID not returning a valid weaponID for cz75a.
+ - Fixed CS_GetWeaponPrice returning incorrect value for M4A1 in CS:GO (bug 6045).
+ - Increased max gamedata byte signature length.
+ - Ported SM build scripts to AMBuild2 (bug 5997).
+
+----------------------------------------------------------
 SourceMod 1.5.2 [2013-10-29]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.5.2_Release_Notes

configure.py

@@ -1,8 +1,19 @@
 # vim: set ts=2 sw=2 tw=99 noet:
 import sys
-import ambuild.runner as runner
+try:
+	from ambuild2 import run
+except:
+	try:
+		import ambuild
+		sys.stderr.write('It looks like you have AMBuild 1 installed, but this project uses AMBuild 2.\n')
+		sys.stderr.write('Upgrade to the latest version of AMBuild to continue.\n')
+	except:
+		sys.stderr.write('AMBuild must be installed to build this project.\n')
+		sys.stderr.write('http://www.alliedmods.net/ambuild\n')
+	sys.exit(1)
 
-run = runner.Runner()
+run = run.PrepareBuild(sourcePath=sys.path[0])
+run.default_build_folder = 'obj-' + run.target_platform
 run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
                        help='Enable debugging symbols')
 run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
@@ -12,4 +23,6 @@ run.options.add_option('--no-mysql', action='store_false', default=True, dest='h
 run.options.add_option('-s', '--sdks', default='all', dest='sdks',
                        help='Build against specified SDKs; valid args are "all", "present", or '
                             'comma-delimited list of engine names (default: %default)')
-run.Configure(sys.path[0])
+run.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump',
+											 default=False, help='Dump and upload breakpad symbols')
+run.Configure()

core/AMBuilder

@@ -1,128 +1,124 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: 
 import os
-from ambuild.command import SymlinkCommand
 
-for i in SM.sdkInfo:
-	sdk = SM.sdkInfo[i]
-	if AMBuild.target['platform'] not in sdk['platform']:
-		continue
+for sdk_name in SM.sdks:
+  sdk = SM.sdks[sdk_name]
+  binary_name = 'sourcemod.' + sdk.ext
 
-	name = 'sourcemod.' + sdk['ext']
+  binary = SM.HL2Library(builder, binary_name, sdk)
+  compiler = binary.compiler
 
-	compiler = SM.DefaultHL2Compiler('core', i)
+  if sdk.name == 'csgo':
+    # Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve.
+    if compiler.cxx.behavior == 'gcc':
+      compiler.cflags += ['-Wno-sign-compare']
+    compiler.cxxincludes += [
+      os.path.join(sdk.path, 'common', 'protobuf-2.3.0', 'src'),
+      os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf')
+    ]
+  elif sdk.name == 'dota':
+    compiler.cxxincludes += [
+      os.path.join(sdk.path, 'common', 'protobuf-2.4.1', 'src'),
+      os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf')
+    ]
 
-	if i == 'csgo':
-		# Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve.
-		if isinstance(compiler.cxx, Cpp.CompatGCC):
-			compiler.AddToListVar('CFLAGS', '-Wno-sign-compare')
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'common', 'protobuf-2.3.0', 'src'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'engine', 'protobuf'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'game', 'shared', 'csgo', 'protobuf'))
+  if builder.target_platform == 'linux':
+    compiler.postlink += ['-lpthread', '-lrt']
 
-	extension = AMBuild.AddJob(name)
-	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-	SM.PreSetupHL2Job(extension, binary, i)
+  if sdk.name == 'csgo' or sdk.name == 'dota':
+    if builder.target_platform == 'linux':
+      lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a')
+    elif builder.target_platform == 'mac':
+      lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
+    elif builder.target_platform == 'windows':
+      if 'DEBUG' in compiler.defines:
+        lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib')
+      else:
+        lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
+    compiler.linkflags.insert(0, binary.Dep(lib_path))
 
-	if i == 'csgo':
-		if AMBuild.target['platform'] == 'linux':
-			link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a')
-			target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'linux32', 'release'), 'libprotobuf.a')
-			try:
-				os.lstat(link)
-			except:
-				extension.AddCommand(SymlinkCommand(link, target))
-		elif AMBuild.target['platform'] == 'darwin':
-			link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a')
-			target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'osx32', 'release'), 'libprotobuf.a')
-			try:
-				os.lstat(link)
-			except:
-				extension.AddCommand(SymlinkCommand(link, target))
-		elif AMBuild.target['platform'] == 'windows':
-			libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
-			binary.RebuildIfNewer(libPath)
-			binary['POSTLINKFLAGS'].append(libPath)
+  binary.sources += [
+    'AdminCache.cpp',
+    'MenuStyle_Valve.cpp',
+    'logic_bridge.cpp',
+    'smn_entities.cpp',
+    'sm_stringutil.cpp',
+    'MenuVoting.cpp',
+    'smn_events.cpp',
+    'smn_menus.cpp',
+    'sm_trie.cpp',
+    'CDataPack.cpp',
+    'frame_hooks.cpp',
+    'smn_nextmap.cpp',
+    'sourcemm_api.cpp',
+    'ChatTriggers.cpp',
+    'smn_player.cpp',
+    'sourcemod.cpp',
+    'concmd_cleaner.cpp',
+    'HalfLife2.cpp',
+    'NextMap.cpp',
+    'ConCmdManager.cpp',
+    'ConVarManager.cpp',
+    'LibrarySys.cpp',
+    'PlayerManager.cpp',
+    'TimerSys.cpp',
+    'CoreConfig.cpp',
+    'Logger.cpp',
+    'smn_halflife.cpp',
+    'smn_console.cpp',
+    'UserMessages.cpp',
+    'MenuManager.cpp',
+    'smn_core.cpp',
+    'smn_hudtext.cpp',
+    'smn_usermsgs.cpp',
+    'MenuStyle_Base.cpp',
+    'smn_keyvalues.cpp',
+    'smn_vector.cpp',
+    'EventManager.cpp',
+    'MenuStyle_Radio.cpp',
+    'sm_autonatives.cpp',
+    'sm_srvcmds.cpp',
+    'ConsoleDetours.cpp',
+    'NativeInvoker.cpp',
+    'smn_database.cpp',
+    'ForwardSys.cpp',
+    'Database.cpp',
+    'DebugReporter.cpp',
+    'ShareSys.cpp',
+    'PluginSys.cpp',
+    'HandleSys.cpp',
+    'NativeOwner.cpp',
+    'ExtensionSys.cpp',
+    'smn_fakenatives.cpp',
+    'smn_filesystem.cpp',
+    'ADTFactory.cpp',
+    'PluginInfoDatabase.cpp',
+  ]
+  
+  if sdk.name in ['csgo', 'dota']:
+    binary.sources += ['smn_protobuf.cpp']
+  else:
+    binary.sources += ['smn_bitbuffer.cpp']
 
-	files = [
-		'AdminCache.cpp',
-		'ExtensionSys.cpp',
-		'MenuStyle_Valve.cpp',
-		'logic_bridge.cpp',
-		'smn_entities.cpp',
-		'sm_stringutil.cpp',
-		'ADTFactory.cpp',
-		'ForwardSys.cpp',
-		'MenuVoting.cpp',
-		'smn_events.cpp',
-		'smn_menus.cpp',
-		'sm_trie.cpp',
-		'CDataPack.cpp',
-		'frame_hooks.cpp',
-		'NativeInvoker.cpp',
-		'smn_fakenatives.cpp',
-		'smn_nextmap.cpp',
-		'sourcemm_api.cpp',
-		'ChatTriggers.cpp',
-		'NativeOwner.cpp',
-		'smn_filesystem.cpp',
-		'smn_player.cpp',
-		'sourcemod.cpp',
-		'concmd_cleaner.cpp',
-		'HalfLife2.cpp',
-		'NextMap.cpp',
-		'ConCmdManager.cpp',
-		'HandleSys.cpp',
-		'ConVarManager.cpp',
-		'LibrarySys.cpp',
-		'PlayerManager.cpp',
-		'TimerSys.cpp',
-		'CoreConfig.cpp',
-		'Logger.cpp',
-		'PluginInfoDatabase.cpp',
-		'smn_halflife.cpp',
-		'PluginSys.cpp',
-		'smn_console.cpp',
-		'UserMessages.cpp',
-		'Database.cpp',
-		'MenuManager.cpp',
-		'smn_core.cpp',
-		'smn_hudtext.cpp',
-		'smn_usermsgs.cpp',
-		'DebugReporter.cpp',
-		'MenuStyle_Base.cpp',
-		'ShareSys.cpp',
-		'smn_database.cpp',
-		'smn_keyvalues.cpp',
-		'smn_vector.cpp',
-		'EventManager.cpp',
-		'MenuStyle_Radio.cpp',
-		'sm_autonatives.cpp',
-		'sm_srvcmds.cpp',
-		'ConsoleDetours.cpp'
-		]
-	
-	if i == 'csgo':
-		files.append('smn_protobuf.cpp')
-	else:
-		files.append('smn_bitbuffer.cpp')
+  if sdk.name == 'csgo':
+    binary.sources += [
+      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
+    ]
+  elif sdk.name == 'dota':
+    binary.sources += [
+      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'networkbasetypes.pb.cc'),
+      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'ai_activity.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'usermessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_commonmessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessage_helpers.cpp'),
+    ]
 
-	binary.AddSourceFiles('core', files)
-
-	if i == 'csgo':
-		files = [
-			os.path.join('public', 'engine', 'protobuf', 'netmessages.pb.cc'),
-			os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
-			os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
-			]
-		binary.AddSourceFiles(AMBuild.cache[sdk['sdk']], files)
-
-	SM.PostSetupHL2Job(extension, binary, i)
-	
-	if i == 'csgo':
-		if AMBuild.target['platform'] in ['linux', 'darwin']:
-			binary.AddObjectFiles(['libprotobuf.a'])
-	
-	SM.AutoVersion('core', binary)
-	SM.ExtractDebugInfo(extension, binary)
-	binary.SendToJob()
+  SM.binaries += [builder.Add(binary)]
 

core/ConVarManager.cpp

@@ -126,6 +126,8 @@ void ConVarManager::OnSourceModAllInitialized()
 	}
 #endif
 
+	g_Players.AddClientListener(this);
+
 	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
 
 	g_PluginSys.AddPluginsListener(this);
@@ -191,6 +193,8 @@ void ConVarManager::OnSourceModShutdown()
 	}
 #endif
 
+	g_Players.RemoveClientListener(this);
+
 	SH_REMOVE_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
 
 	/* Remove the 'convars' option from the 'sm' console command */
@@ -307,6 +311,22 @@ void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 	}
 }
 
+void ConVarManager::OnClientDisconnected(int client)
+{
+	/* Remove convar queries for this client that haven't returned results yet */
+	for (List<ConVarQuery>::iterator iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
+	{
+		ConVarQuery &query = (*iter);
+		if (query.client == client)
+		{
+			iter = m_ConVarQueries.erase(iter);
+			continue;
+		}
+
+		++iter;
+	}
+}
+
 void ConVarManager::OnHandleDestroy(HandleType_t type, void *object)
 {
 }
@@ -619,7 +639,7 @@ QueryCvarCookie_t ConVarManager::QueryClientConVar(edict_t *pPlayer, const char
 		return InvalidQueryCvarCookie;
 	}
 
-	ConVarQuery query = {cookie, pCallback, hndl};
+	ConVarQuery query = {cookie, pCallback, (cell_t)hndl, IndexOfEdict(pPlayer)};
 	m_ConVarQueries.push_back(query);
 #endif
 

core/ConVarManager.h

@@ -39,8 +39,10 @@
 #include <IForwardSys.h>
 #include <IHandleSys.h>
 #include <IRootConsoleMenu.h>
+#include <IPlayerHelpers.h>
 #include <compat_wrappers.h>
 #include "concmd_cleaner.h"
+#include "PlayerManager.h"
 
 #if SOURCE_ENGINE == SE_DARKMESSIAH
 class EQueryCvarValueStatus;
@@ -75,6 +77,7 @@ struct ConVarQuery
 	QueryCvarCookie_t cookie;			/**< Cookie that identifies query */
 	IPluginFunction *pCallback;			/**< Function that will be called when query is finished */
 	cell_t value;						/**< Optional value passed to query function */
+	cell_t client;						/**< Only used for cleaning up on client disconnection */
 };
 
 class ConVarManager :
@@ -82,7 +85,8 @@ class ConVarManager :
 	public IHandleTypeDispatch,
 	public IPluginsListener,
 	public IRootConsoleCommand,
-	public IConCommandTracker
+	public IConCommandTracker,
+	public IClientListener
 {
 public:
 	ConVarManager();
@@ -101,6 +105,8 @@ public: //IRootConsoleCommand
 	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public: //IConCommandTracker
 	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
+public: //IClientListener
+	void OnClientDisconnected(int client);
 public:
 	/**
 	 * Create a convar and return a handle to it.

core/CoreConfig.cpp

@@ -408,7 +408,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 			FILE *fp = fopen(file, "wt");
 			if (fp)
 			{
-				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_VERSION_STRING);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SOURCEMOD_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 

core/ForwardSys.cpp

@@ -193,6 +193,7 @@ void CForwardManager::ForwardFree(CForward *fwd)
 
 	m_FreeForwards.push(fwd);
 	m_managed.remove(fwd);
+	m_unmanaged.remove(fwd);
 }
 
 CForward *CForwardManager::ForwardMake()

core/HalfLife2.cpp

@@ -72,8 +72,23 @@ CHalfLife2 g_HL2;
 ConVar *sv_lan = NULL;
 
 static void *g_EntList = NULL;
+static void **g_pEntInfoList = NULL;
 static int entInfoOffset = -1;
 
+static CEntInfo *EntInfoArray()
+{
+	if (g_EntList != NULL)
+	{
+		return (CEntInfo *)((intp)g_EntList + entInfoOffset);
+	}
+	else if (g_pEntInfoList)
+	{
+		return *(CEntInfo **)g_pEntInfoList;
+	}
+	
+	return NULL;
+}
+
 namespace SourceHook
 {
 	template<>
@@ -192,40 +207,39 @@ void CHalfLife2::InitLogicalEntData()
 #endif
 	}
 
-
 	if (!g_EntList)
 	{
-		if (!g_pGameConf->GetMemSig("LevelShutdown", (void **)&addr))
+		if (g_pGameConf->GetMemSig("LevelShutdown", (void **) &addr) && addr)
 		{
-			g_Logger.LogError("Logical Entities not supported by this mod (LevelShutdown) - Reverting to networkable entities only");
-			return;
-		}
+			int offset;
+			if (!g_pGameConf->GetOffset("gEntList", &offset))
+			{
+				g_Logger.LogError("Logical Entities not supported by this mod (gEntList) - Reverting to networkable entities only");
+				return;
+			}
 
-		if (!addr)
-		{
-			g_Logger.LogError("Failed lookup of LevelShutdown - Reverting to networkable entities only");
-			return;
-		}
+			g_EntList = *reinterpret_cast<void **>(addr + offset);
 
-		int offset;
-		if (!g_pGameConf->GetOffset("gEntList", &offset))
-		{
-			g_Logger.LogError("Logical Entities not supported by this mod (gEntList) - Reverting to networkable entities only");
-			return;
 		}
-
-		g_EntList = *reinterpret_cast<void **>(addr + offset);
 	}
-	
-	if (!g_EntList)
+
+	// If we have g_EntList from either of the above methods, make sure we can get the offset from it to EntInfo as well
+	if (g_EntList && !g_pGameConf->GetOffset("EntInfo", &entInfoOffset))
 	{
-		g_Logger.LogError("Failed lookup of gEntList - Reverting to networkable entities only");
+		g_Logger.LogError("Logical Entities not supported by this mod (EntInfo) - Reverting to networkable entities only");
+		g_EntList = NULL;
 		return;
 	}
 
-	if (!g_pGameConf->GetOffset("EntInfo", &entInfoOffset))
+	// If we don't have g_EntList or have it but don't know where EntInfo is on it, use fallback.
+	if (!g_EntList || entInfoOffset == -1)
 	{
-		g_Logger.LogError("Logical Entities not supported by this mod (EntInfo) - Reverting to networkable entities only");
+		g_pGameConf->GetAddress("EntInfosPtr", (void **)&g_pEntInfoList);
+	}
+	
+	if (!g_EntList && !g_pEntInfoList)
+	{
+		g_Logger.LogError("Failed lookup of gEntList - Reverting to networkable entities only");
 		return;
 	}
 }
@@ -737,6 +751,7 @@ void CHalfLife2::ProcessFakeCliCmdQueue()
 		}
 
 		m_CmdQueue.pop();
+		m_FreeCmds.push(pFake);
 	}
 }
 
@@ -993,7 +1008,9 @@ CEntInfo *CHalfLife2::LookupEntity(int entIndex)
 		return NULL;
 	}
 
-	if (!g_EntList || entInfoOffset == -1)
+	CEntInfo *entInfos = EntInfoArray();
+
+	if (!entInfos)
 	{
 		/* Attempt to use engine interface instead */
 		static CEntInfo tempInfo;
@@ -1020,8 +1037,7 @@ CEntInfo *CHalfLife2::LookupEntity(int entIndex)
 		return &tempInfo;
 	}
 
-	CEntInfo *pArray = (CEntInfo *)(((unsigned char *)g_EntList) + entInfoOffset);
-	return &pArray[entIndex];
+	return &entInfos[entIndex];
 }
 
 /**

core/Logger.cpp

@@ -149,7 +149,7 @@ void Logger::_NewMapFile()
 	} else {
 		char date[32];
 		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SM_VERSION_STRING);
+		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SOURCEMOD_VERSION);
 		fclose(fp);
 	}
 }
@@ -362,7 +362,7 @@ void Logger::LogMessage(const char *vafmt, ...)
 			char date[32];
 			m_DailyPrintHdr = false;
 			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SM_VERSION_STRING);
+			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SOURCEMOD_VERSION);
 	 	}
 		va_list ap;
 		va_start(ap, vafmt);

core/PlayerManager.cpp

@@ -816,7 +816,7 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 		}
 
 		ClientConsolePrint(pEntity,
-			"SourceMod %s, by AlliedModders LLC", SM_VERSION_STRING);
+			"SourceMod %s, by AlliedModders LLC", SOURCEMOD_VERSION);
 		ClientConsolePrint(pEntity,
 			"To see running plugins, type \"sm plugins\"");
 		ClientConsolePrint(pEntity,
@@ -1830,7 +1830,11 @@ void CPlayer::Kick(const char *str)
 	else
 	{
 		IClient *pClient = static_cast<IClient *>(pNetChan->GetMsgHandler());
+#if SOURCE_ENGINE == SE_CSGO
+		pClient->Disconnect(str);
+#else
 		pClient->Disconnect("%s", str);
+#endif
 	}
 }
 

core/logic/AMBuilder

@@ -1,61 +1,59 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultCompiler()
-base = AMBuild.sourceFolder
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
-compiler['CXXINCLUDES'].append(os.path.join(base, 'core', 'logic'))
-compiler['CXXINCLUDES'].append(os.path.join(base, 'public'))
-compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn'))
-compiler['CDEFINES'].append('SM_DEFAULT_THREADER')
-compiler['CDEFINES'].append('SM_LOGIC')
-
-if AMBuild.target['platform'] == 'linux':
-	compiler['POSTLINKFLAGS'].append('-lpthread')
-if AMBuild.target['platform'] == 'darwin':
-	compiler['CFLAGS'].extend(['-Wno-deprecated-declarations'])
-	compiler['POSTLINKFLAGS'].extend(['-framework', 'CoreServices'])
-
-extension = AMBuild.AddJob('sourcemod.logic')
-binary = Cpp.LibraryBuilder('sourcemod.logic', AMBuild, extension, compiler)
-files = [
-	'common_logic.cpp',
-	'smn_adt_array.cpp',
-	'smn_sorting.cpp',
-	'smn_maplists.cpp',
-	'smn_adt_stack.cpp',
-	'thread/ThreadWorker.cpp',
-	'thread/BaseWorker.cpp',
-	'ThreadSupport.cpp',
-	'smn_float.cpp',
-	'TextParsers.cpp',
-	'smn_textparse.cpp',
-	'smn_adt_trie.cpp',
-	'Profiler.cpp',
-	'smn_functions.cpp',
-	'smn_timers.cpp',
-	'smn_players.cpp',
-	'MemoryUtils.cpp',
-	'smn_admin.cpp',
-	'smn_banning.cpp',
-	'stringutil.cpp',
-	'Translator.cpp',
-	'PhraseCollection.cpp',
-	'smn_lang.cpp',
-	'smn_string.cpp',
-	'smn_handles.cpp',
-	'smn_datapacks.cpp',
-	'smn_gameconfigs.cpp',
-	'GameConfigs.cpp',
-	'sm_crc32.cpp',
-	'smn_profiler.cpp'
-	]
-if AMBuild.target['platform'] == 'windows':
-	files.append('thread/WinThreads.cpp')
+binary = SM.Library(builder, 'sourcemod.logic')
+binary.compiler.cxxincludes += [
+  os.path.join(builder.sourcePath, 'core', 'logic'),
+  os.path.join(builder.sourcePath, 'public'),
+  os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
+  os.path.join(builder.sourcePath, 'public', 'amtl'),
+  os.path.join(SM.mms_root, 'core', 'sourcehook')
+]
+binary.compiler.defines += [
+  'SM_DEFAULT_THREADER',
+  'SM_LOGIC'
+]
+  
+if builder.target_platform == 'linux':
+  binary.compiler.postlink += ['-lpthread', '-lrt']
+elif builder.target_platform == 'mac':
+  binary.compiler.cflags += ['-Wno-deprecated-declarations']
+  binary.compiler.postlink += ['-framework', 'CoreServices']
+binary.sources += [
+  'common_logic.cpp',
+  'smn_adt_array.cpp',
+  'smn_sorting.cpp',
+  'smn_maplists.cpp',
+  'smn_adt_stack.cpp',
+  'thread/ThreadWorker.cpp',
+  'thread/BaseWorker.cpp',
+  'ThreadSupport.cpp',
+  'smn_float.cpp',
+  'TextParsers.cpp',
+  'smn_textparse.cpp',
+  'smn_adt_trie.cpp',
+  'Profiler.cpp',
+  'smn_functions.cpp',
+  'smn_timers.cpp',
+  'smn_players.cpp',
+  'MemoryUtils.cpp',
+  'smn_admin.cpp',
+  'smn_banning.cpp',
+  'stringutil.cpp',
+  'Translator.cpp',
+  'PhraseCollection.cpp',
+  'smn_lang.cpp',
+  'smn_string.cpp',
+  'smn_handles.cpp',
+  'smn_datapacks.cpp',
+  'smn_gameconfigs.cpp',
+  'GameConfigs.cpp',
+  'sm_crc32.cpp',
+  'smn_profiler.cpp',
+]
+if builder.target_platform == 'windows':
+  binary.sources += ['thread/WinThreads.cpp']
 else:
-	files.append('thread/PosixThreads.cpp')
-binary.AddSourceFiles('core/logic', files)
-SM.AutoVersion('core/logic', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+  binary.sources += ['thread/PosixThreads.cpp']
 
+SM.binaries += [builder.Add(binary)]

core/logic/GameConfigs.cpp

@@ -90,7 +90,7 @@ struct TempSigInfo
 		library[0] = '\0';
 		sig[0] = '\0';
 	}
-	char sig[512];
+	char sig[1024];
 	char library[64];
 } s_TempSig;
 unsigned int s_ServerBinCRC;
@@ -607,19 +607,11 @@ skip_find:
 		{
 			m_ParseState = PSTATE_GAMEDEFS_ADDRESSES;
 
-			if (m_Address[0] == '\0')
+			if (m_Address[0] != '\0' && m_AddressSignature[0] != '\0')
 			{
-				smcore.LogError("[SM] Address sections must have names (gameconf \"%s\")", m_CurFile);
-				break;
+				AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead);
+				m_pAddresses->replace(m_Address, addrConf);
 			}
-			if (m_AddressSignature[0] == '\0')
-			{
-				smcore.LogError("[SM] Address section for \"%s\" did not specify a signature (gameconf \"%s\")", m_Address, m_CurFile);
-				break;
-			}
-
-			AddressConf addrConf(m_AddressSignature, sizeof(m_AddressSignature), m_AddressReadCount, m_AddressRead);
-			m_pAddresses->replace(m_Address, addrConf);
 
 			break;
 		}

core/sm_srvcmds.cpp

@@ -39,7 +39,7 @@
 
 RootConsoleMenu g_RootMenu;
 
-ConVar sourcemod_version("sourcemod_version", SM_VERSION_STRING, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
+ConVar sourcemod_version("sourcemod_version", SOURCEMOD_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
 
 RootConsoleMenu::RootConsoleMenu()
 {
@@ -339,11 +339,11 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 	else if (strcmp(cmdname, "version") == 0)
 	{
 		ConsolePrint(" SourceMod Version Information:");
-		ConsolePrint("    SourceMod Version: %s", SM_VERSION_STRING);
+		ConsolePrint("    SourceMod Version: %s", SOURCEMOD_VERSION);
 		ConsolePrint("    SourcePawn Engine: %s (build %s)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString());
 		ConsolePrint("    SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion());
 		ConsolePrint("    Compiled on: %s %s", __DATE__, __TIME__);
-		ConsolePrint("    Build ID: %s", SM_BUILD_UNIQUEID);
+		ConsolePrint("    Build ID: %s", SOURCEMOD_BUILD_ID);
 		ConsolePrint("    http://www.sourcemod.net/");
 	}
 }

core/smn_database.cpp

@@ -1407,6 +1407,23 @@ static cell_t SQL_ConnectCustom(IPluginContext *pContext, const cell_t *params)
 	return hndl;
 }
 
+static cell_t SQL_SetCharset(IPluginContext *pContext, const cell_t *params)
+{
+	IDatabase *db = NULL;
+	HandleError err;
+
+	if ((err = g_DBMan.ReadHandle(params[1], DBHandle_Database, (void **)&db))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid database Handle %x (error: %d)", params[1], err);
+	}
+
+	char *characterset;
+	pContext->LocalToString(params[2], &characterset);
+
+	return db->SetCharacterSet(characterset);
+}
+
 REGISTER_NATIVES(dbNatives)
 {
 	{"SQL_BindParamInt",		SQL_BindParamInt},
@@ -1448,6 +1465,7 @@ REGISTER_NATIVES(dbNatives)
 	{"SQL_TQuery",				SQL_TQuery},
 	{"SQL_UnlockDatabase",		SQL_UnlockDatabase},
 	{"SQL_ConnectCustom",		SQL_ConnectCustom},
+	{"SQL_SetCharset",		SQL_SetCharset},
 	{NULL,						NULL},
 };
 

core/sourcemm_api.cpp

@@ -147,7 +147,7 @@ const char *SourceMod_Core::GetLicense()
 
 const char *SourceMod_Core::GetVersion()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *SourceMod_Core::GetDate()

extensions/bintools/AMBuilder

@@ -1,25 +1,23 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/bintools')
-compiler['CDEFINES'].append('HOOKING_ENABLED')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
-compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit'))
-compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86'))
+binary = SM.ExtLibrary(builder, 'bintools.ext')
+binary.compiler.defines += ['HOOKING_ENABLED']
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+  os.path.join(builder.sourcePath, 'public', 'jit'),
+  os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
+]
 
-extension = AMBuild.AddJob('bintools.ext')
-binary = Cpp.LibraryBuilder('bintools.ext', AMBuild, extension, compiler)
-binary.AddSourceFiles('extensions/bintools', [
-	'extension.cpp',
-	'CallMaker.cpp',
-	'CallWrapper.cpp',
-	'HookWrapper.cpp',
-	'jit_call.cpp',
-	'jit_hook.cpp',
-	'sdk/smsdk_ext.cpp'
-	])
-SM.AutoVersion('extensions/bintools', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary.sources += [
+  'extension.cpp',
+  'CallMaker.cpp',
+  'CallWrapper.cpp',
+  'HookWrapper.cpp',
+  'jit_call.cpp',
+  'jit_hook.cpp',
+  'sdk/smsdk_ext.cpp'
+]
 
+SM.extensions += [builder.Add(binary)]
 

extensions/bintools/extension.cpp

@@ -61,11 +61,11 @@ bool BinTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 const char *BinTools::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *BinTools::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

extensions/clientprefs/AMBuilder

@@ -1,20 +1,19 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/clientprefs')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+binary = SM.ExtLibrary(builder, 'clientprefs.ext')
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+]
 
-extension = AMBuild.AddJob('clientprefs.ext')
-binary = Cpp.LibraryBuilder('clientprefs.ext', AMBuild, extension, compiler)
-binary.AddSourceFiles('extensions/clientprefs', [
-	'extension.cpp',
-	'cookie.cpp',
-	'menus.cpp',
-	'natives.cpp',
-	'query.cpp',
-	'sdk/smsdk_ext.cpp'
-	])
-SM.AutoVersion('extensions/clientprefs', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary.sources += [
+  'extension.cpp',
+  'cookie.cpp',
+  'menus.cpp',
+  'natives.cpp',
+  'query.cpp',
+  'sdk/smsdk_ext.cpp'
+]
+
+SM.extensions += [builder.Add(binary)]
 

extensions/clientprefs/extension.cpp

@@ -483,11 +483,11 @@ IdentityToken_t *ClientPrefs::GetIdentity() const
 
 const char *ClientPrefs::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *ClientPrefs::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

extensions/cstrike/AMBuilder

@@ -1,33 +1,21 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for i in SM.sdkInfo:
-	if i != 'css' and i != 'csgo':
-		continue
-	
-	sdk = SM.sdkInfo[i]
-	
-	if AMBuild.target['platform'] not in sdk['platform']:
-		continue
-	
-	compiler = SM.DefaultHL2Compiler('extensions/cstrike', i)
-
-	name = 'game.cstrike.ext.' + sdk['ext']
-	extension = AMBuild.AddJob(name)
-	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-	SM.PreSetupHL2Job(extension, binary, i)
-	binary.AddSourceFiles('extensions/cstrike', [
-		'extension.cpp',
-		'natives.cpp',
-		'RegNatives.cpp',
-		'timeleft.cpp',
-		'forwards.cpp',
-		'util_cstrike.cpp',
-		'sdk/smsdk_ext.cpp',
-		'CDetour/detours.cpp',
-		'asm/asm.c'
-		])
-	SM.PostSetupHL2Job(extension, binary, i)
-	SM.AutoVersion('extensions/cstrike', binary)
-	SM.ExtractDebugInfo(extension, binary)
-	binary.SendToJob()
+for sdk_name in ['css', 'csgo']:
+  if sdk_name not in SM.sdks:
+    continue
+  sdk = SM.sdks[sdk_name]
+  
+  binary = SM.HL2Library(builder, 'game.cstrike.ext.' + sdk.ext, sdk)
+  binary.sources += [
+    'extension.cpp',
+    'natives.cpp',
+    'RegNatives.cpp',
+    'timeleft.cpp',
+    'forwards.cpp',
+    'util_cstrike.cpp',
+    'sdk/smsdk_ext.cpp',
+    'CDetour/detours.cpp',
+    'asm/asm.c'
+  ]
+  SM.extensions += [builder.Add(binary)]

extensions/cstrike/extension.cpp

@@ -283,12 +283,12 @@ bool CStrike::ProcessCommandTarget(cmd_target_info_t *info)
 
 const char *CStrike::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *CStrike::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 
 void CStrike::OnPluginLoaded(IPlugin *plugin)

extensions/cstrike/extension.h

@@ -52,6 +52,7 @@ int CallPriceForward(int client, const char *weapon_name, int price);
 #define WEAPON_ASSAULTSUIT 51
 #define WEAPON_NIGHTVISION 52
 #define WEAPON_DEFUSER 53
+#define WEAPON_M4 16
 #else
 #define WEAPON_C4 6
 #define WEAPON_KNIFE 28

extensions/cstrike/forwards.cpp

@@ -21,6 +21,13 @@ CDetour *DCSWeaponDrop = NULL;
 
 int weaponNameOffset = -1;
 
+//Windows CS:GO
+// int __userpurge HandleCommand_Buy_Internal<eax>(int a1<ecx>, float a2<xmm0>, int a3, int a4, char a5)
+// a1 - this
+// a2 - CCSGameRules::GetWarmupPeriodEndTime(g_pGameRules)
+// a3 - weapon
+// a4 - unknown
+// a5 - bRebuy
 #if SOURCE_ENGINE == SE_CSGO
 DETOUR_DECL_MEMBER3(DetourHandleBuy, int, const char *, weapon, int, iUnknown, bool, bRebuy)
 #else
@@ -69,7 +76,7 @@ DETOUR_DECL_MEMBER2(DetourWeaponPrice, int, const char *, szAttribute, CEconItem
 {
 	int price = DETOUR_MEMBER_CALL(DetourWeaponPrice)(szAttribute, pEconItem);
 
-	if(lastclient == -1 || strcmp(szAttribute, "in_game_price") != 0)
+	if(lastclient == -1 || strcmp(szAttribute, "in game price") != 0)
 		return price;
 
 	const char *weapon_name = reinterpret_cast<char *>(this+weaponNameOffset);
@@ -78,6 +85,7 @@ DETOUR_DECL_MEMBER2(DetourWeaponPrice, int, const char *, szAttribute, CEconItem
 }
 #endif
 
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 DETOUR_DECL_MEMBER2(DetourTerminateRound, void, float, delay, int, reason)
 {
 	if (g_pIgnoreTerminateDetour)
@@ -86,6 +94,30 @@ DETOUR_DECL_MEMBER2(DetourTerminateRound, void, float, delay, int, reason)
 		DETOUR_MEMBER_CALL(DetourTerminateRound)(delay, reason);
 		return;
 	}
+#else
+//Windows CSGO
+//char __userpurge TerminateRound<al>(unsigned int a1<ecx>, signed int a2<edi>, unsigned int a3<xmm1>, int a4)
+// a1 - this
+// a2 - unknown
+// a3 - delay
+// a4 - reason
+DETOUR_DECL_MEMBER1(DetourTerminateRound, void, int, reason)
+{
+	float delay;
+
+	if (g_pIgnoreTerminateDetour)
+	{
+		g_pIgnoreTerminateDetour = false;
+		return DETOUR_MEMBER_CALL(DetourTerminateRound)(reason);
+	}
+
+	//Save the delay
+	__asm
+	{
+		movss delay, xmm1
+	}
+#endif
+
 	float orgdelay = delay;
 	int orgreason = reason;
 
@@ -98,10 +130,26 @@ DETOUR_DECL_MEMBER2(DetourTerminateRound, void, float, delay, int, reason)
 	if (result >= Pl_Handled)
 		return;
 
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	if (result == Pl_Changed)
 		return DETOUR_MEMBER_CALL(DetourTerminateRound)(delay, reason);
 
 	return DETOUR_MEMBER_CALL(DetourTerminateRound)(orgdelay, orgreason);
+#else
+	if (result == Pl_Changed)
+	{
+		__asm
+		{
+			movss xmm1, delay
+		}
+		return DETOUR_MEMBER_CALL(DetourTerminateRound)(reason);
+	}
+	__asm
+	{
+		movss xmm1, orgdelay
+	}
+	return DETOUR_MEMBER_CALL(DetourTerminateRound)(orgreason);
+#endif
 }
 
 DETOUR_DECL_MEMBER3(DetourCSWeaponDrop, void, CBaseEntity *, weapon, bool, something, bool, toss)

extensions/cstrike/natives.cpp

@@ -34,6 +34,7 @@
 #include "forwards.h"
 #include "util_cstrike.h"
 #include <server_class.h>
+#include <iplayerinfo.h>
 
 int g_iPriceOffset = -1;
 
@@ -46,6 +47,12 @@ int g_iPriceOffset = -1;
 	code; \
 	g_RegNatives.Register(pWrapper);
 
+#define GET_MEMSIG(name) \
+	if (!g_pGameConf->GetMemSig(name, &addr) || !addr) \
+	{ \
+		return pContext->ThrowNativeError("Failed to locate function"); \
+	}
+
 inline CBaseEntity *GetCBaseEntity(int num, bool isplayer)
 {
 	edict_t *pEdict = gamehelpers->EdictOfIndex(num);
@@ -150,6 +157,7 @@ static cell_t CS_RespawnPlayer(IPluginContext *pContext, const cell_t *params)
 
 static cell_t CS_SwitchTeam(IPluginContext *pContext, const cell_t *params)
 {
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	static ICallWrapper *pWrapper = NULL;
 	if (!pWrapper)
 	{
@@ -174,6 +182,41 @@ static cell_t CS_SwitchTeam(IPluginContext *pContext, const cell_t *params)
 	vptr += sizeof(CBaseEntity *);
 	*(int *)vptr = params[2];
 	pWrapper->Execute(vstk, NULL);
+#else
+	if (g_pSDKTools == NULL)
+	{
+		return pContext->ThrowNativeError("SDKTools interface not found. SwitchTeam native disabled.");
+	}
+
+	static void *addr = NULL;
+	if(!addr)
+	{
+		GET_MEMSIG("SwitchTeam");
+	}
+
+	void *gamerules = g_pSDKTools->GetGameRules();
+	if (gamerules == NULL)
+	{
+		return pContext->ThrowNativeError("GameRules not available. SwitchTeam native disabled.");
+	}
+
+	CBaseEntity *pEntity;
+	if (!(pEntity=GetCBaseEntity(params[1], true)))
+	{
+		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
+	}
+
+	int team = params[2];
+
+	__asm
+	{
+		push team
+		mov ecx, pEntity
+		mov ebx, gamerules
+ 
+		call addr
+	}
+#endif
 
 	return 1;
 }
@@ -248,7 +291,7 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
 {
 	if (g_pSDKTools == NULL)
 	{
-		smutils->LogError(myself, "SDKTools interface not found. TerminateRound native disabled.");
+		return pContext->ThrowNativeError("SDKTools interface not found. TerminateRound native disabled.");
 	}
 	else if (g_pSDKTools->GetInterfaceVersion() < 2)
 	{
@@ -256,6 +299,13 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("SDKTools interface is outdated. TerminateRound native disabled.");
 	}
 
+	void *gamerules = g_pSDKTools->GetGameRules();
+	if (gamerules == NULL)
+	{
+		return pContext->ThrowNativeError("GameRules not available. TerminateRound native disabled.");
+	}
+
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	static ICallWrapper *pWrapper = NULL;
 
 	if (!pWrapper)
@@ -271,12 +321,6 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
 			pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 2))
 	}
 
-	void *gamerules = g_pSDKTools->GetGameRules();
-	if (gamerules == NULL)
-	{
-		return pContext->ThrowNativeError("GameRules not available. TerminateRound native disabled.");
-	}
-
 	if (params[3] == 1 && g_pTerminateRoundDetoured)
 		g_pIgnoreTerminateDetour = true;
 
@@ -290,7 +334,30 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
 	*(int*)vptr = params[2];
 
 	pWrapper->Execute(vstk, NULL);
+#else
+	static void *addr = NULL;
 
+	if(!addr)
+	{
+		GET_MEMSIG("TerminateRound");
+	}
+
+	if (params[3] == 1 && g_pTerminateRoundDetoured)
+		g_pIgnoreTerminateDetour = true;
+
+	float delay = sp_ctof(params[1]);
+	int reason = params[2];
+	signed int unknown = 1;//We might want to find what this is?
+	__asm
+	{
+		push reason
+		movss xmm1, delay
+		mov edi, unknown
+		mov ecx, gamerules
+		call addr
+	}
+
+#endif
 	return 1;
 }
 
@@ -360,6 +427,11 @@ static cell_t CS_GetWeaponPrice(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Failed to get weaponinfo");
 	}
 
+	CBaseEntity *pEntity;
+	if (!(pEntity = GetCBaseEntity(params[1], true)))
+	{
+		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
+	}
 #if SOURCE_ENGINE == SE_CSGO
 	static ICallWrapper *pWrapper = NULL;
 
@@ -380,14 +452,91 @@ static cell_t CS_GetWeaponPrice(IPluginContext *pContext, const cell_t *params)
 		pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, &ret, pass, 2))
 	}
 
+	// Get a CEconItemView for the m4
+	// Found in CCSPlayer::HandleCommand_Buy_Internal
+	// Linux a1 - CCSPlayer *pEntity, v5 - Player Team, a3 - ItemLoadoutSlot -1 use default loadoutslot:
+	// v4 = *(int (__cdecl **)(_DWORD, _DWORD, _DWORD))(*(_DWORD *)(a1 + 9492) + 36); // offset 9
+	// v6 = v4(a1 + 9492, v5, a3);
+	// Windows v5 - CCSPlayer *pEntity a4 -  ItemLoadoutSlot -1 use default loadoutslot:
+	// v8 = (*(int (__stdcall **)(_DWORD, int))(*(_DWORD *)(v5 + 9472) + 32))(*(_DWORD *)(v5 + 760), a4); // offset 8
+	// The function is CCSPlayerInventory::GetItemInLoadout(int, int)
+	// We can pass NULL view to the GetAttribute to use default loadoutslot.
+	// We only really care about m4a1/m4a4 as price differs between them
+	// thisPtrOffset = 9472/9492
+
+	static ICallWrapper *pGetView = NULL;
+	static int thisPtrOffset = -1;
+	CEconItemView *view = NULL;
+
+	if(!pGetView)
+	{
+		int offset = -1;
+		int byteOffset = -1;
+		void *pHandleCommandBuy = NULL;
+		if (!g_pGameConf->GetOffset("GetItemInLoadout", &offset) || offset == -1)
+		{
+			smutils->LogError(myself, "Failed to get GetItemInLoadout offset. Reverting to NULL ItemView");
+		}
+		else if (!g_pGameConf->GetOffset("CCSPlayerInventoryOffset", &byteOffset) || byteOffset == -1)
+		{
+			smutils->LogError(myself, "Failed to get CCSPlayerInventoryOffset offset. Reverting to NULL ItemView");
+		}
+		else if (!g_pGameConf->GetMemSig("HandleCommand_Buy_Internal", &pHandleCommandBuy) || !pHandleCommandBuy)
+		{
+			smutils->LogError(myself, "Failed to get HandleCommand_Buy_Internal function. Reverting to NULL ItemView");
+		}
+		else
+		{
+			thisPtrOffset = *(int *)((intptr_t)pHandleCommandBuy + byteOffset);
+
+			PassInfo pass[2];
+			PassInfo ret;
+			pass[0].flags = PASSFLAG_BYVAL;
+			pass[0].type  = PassType_Basic;
+			pass[0].size  = sizeof(int);
+			pass[1].flags = PASSFLAG_BYVAL;
+			pass[1].type  = PassType_Basic;
+			pass[1].size  = sizeof(int);
+
+			ret.flags = PASSFLAG_BYVAL;
+			ret.type = PassType_Basic;
+			ret.size = sizeof(void *);
+
+			pGetView = g_pBinTools->CreateVCall(offset, 0, 0, &ret, pass, 2);
+			g_RegNatives.Register(pGetView);
+		}
+	}
+
+	IPlayerInfo *playerinfo = playerhelpers->GetGamePlayer(params[1])->GetPlayerInfo();
+	if(pGetView && thisPtrOffset != -1 && playerinfo)
+	{
+		//If the gun isnt an M4 we ignore this as M4 is the only one that differs in price based on Loadout item.
+		int iLoadoutSlot = -1;
+		if(id == WEAPON_M4)
+		{
+			iLoadoutSlot = 15;
+		}
+
+		unsigned char vstk_view[sizeof(void *) + sizeof(int) * 2];
+		unsigned char *vptr_view = vstk_view;
+
+		*(void **)vptr_view = (void *)((intptr_t)pEntity + thisPtrOffset);
+		vptr_view += sizeof(void *);
+		*(int *)vptr_view = playerinfo->GetTeamIndex();
+		vptr_view += sizeof(int);
+		*(int *)vptr_view = iLoadoutSlot;
+
+		pGetView->Execute(vstk_view, &view);
+	}
+
 	unsigned char vstk[sizeof(void *) * 2 + sizeof(char *)];
 	unsigned char *vptr = vstk;
 
 	*(void **)vptr = info;
 	vptr += sizeof(void *);
-	*(const char **)vptr = "in_game_price";
-	vptr += sizeof(const char **);
-	*(CEconItemView **)vptr = NULL;
+	*(const char **)vptr = "in game price";
+	vptr += sizeof(const char *);
+	*(CEconItemView **)vptr = view;
 
 	int price = 0;
  	pWrapper->Execute(vstk, &price);
@@ -404,12 +553,6 @@ static cell_t CS_GetWeaponPrice(IPluginContext *pContext, const cell_t *params)
 	int price = *(int *)((intptr_t)info + g_iPriceOffset);
 #endif
 
-	CBaseEntity *pEntity;
-	if (!(pEntity = GetCBaseEntity(params[1], true)))
-	{
-		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
-	}
-
 	if (params[3] || weaponNameOffset == -1)
 		return price;
 
@@ -506,6 +649,10 @@ static cell_t CS_AliasToWeaponID(IPluginContext *pContext, const cell_t *params)
 	{
 		return SMCSWeapon_HKP2000;
 	}
+	else if(strstr(weapon, "cz75a") != NULL)
+	{
+		return SMCSWeapon_P250;
+	}
 #endif
 
 	int id = GetFakeWeaponID(AliasToWeaponID(weapon));

extensions/cstrike/util_cstrike.cpp

@@ -44,8 +44,17 @@
 	code; \
 	g_RegNatives.Register(pWrapper);
 
+#define GET_MEMSIG(name, defaultret) \
+	if (!g_pGameConf->GetMemSig(name, &addr) || !addr) \
+	{ \
+		g_pSM->LogError(myself, "Failed to locate function."); \
+		return defaultret;\
+	}
+
 void *GetWeaponInfo(int weaponID)
 {
+	void *info;
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	static ICallWrapper *pWrapper = NULL;
 	if (!pWrapper)
 	{
@@ -61,8 +70,6 @@ void *GetWeaponInfo(int weaponID)
 			pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
 	}
 
-	void *info;
-
 	unsigned char vstk[sizeof(int)];
 	unsigned char *vptr = vstk;
 
@@ -70,11 +77,30 @@ void *GetWeaponInfo(int weaponID)
 
 	pWrapper->Execute(vstk, &info);
 
+	
+#else
+	static void *addr = NULL;
+
+	if(!addr)
+	{
+		GET_MEMSIG("GetWeaponInfo", 0);
+	}
+
+	__asm
+	{
+		mov ecx, weaponID
+		call addr
+		mov info, eax
+	}
+#endif
 	return info;
 }
 
 const char *GetTranslatedWeaponAlias(const char *weapon)
 {
+	const char *alias = NULL;
+
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	static ICallWrapper *pWrapper = NULL;
 
 	if (!pWrapper)
@@ -90,20 +116,35 @@ const char *GetTranslatedWeaponAlias(const char *weapon)
 			retpass.size = sizeof(const char *); \
 			pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
 	}
-	const char *ret = NULL;
 
 	unsigned char vstk[sizeof(const char *)];
 	unsigned char *vptr = vstk;
 
 	*(const char **)vptr = weapon;
 
-	pWrapper->Execute(vstk, &ret);
+	pWrapper->Execute(vstk, &alias);
+#else
+	static void *addr = NULL;
 
-	return ret;
+	if(!addr)
+	{
+		GET_MEMSIG("GetTranslatedWeaponAlias", weapon);
+	}
+
+	__asm
+	{
+		mov ecx, weapon
+		call addr
+		mov alias, eax
+	}
+#endif
+	return alias;
 }
 
 int AliasToWeaponID(const char *weapon)
 {
+	int weaponID = 0;
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	static ICallWrapper *pWrapper = NULL;
 
 	if (!pWrapper)
@@ -119,7 +160,6 @@ int AliasToWeaponID(const char *weapon)
 			retpass.size = sizeof(int); \
 			pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
 	}
-	int weaponID = 0;
 
 	unsigned char vstk[sizeof(const char *)];
 	unsigned char *vptr = vstk;
@@ -127,12 +167,28 @@ int AliasToWeaponID(const char *weapon)
 	*(const char **)vptr = weapon;
 
 	pWrapper->Execute(vstk, &weaponID);
+#else
+	static void *addr = NULL;
 
+	if(!addr)
+	{
+		GET_MEMSIG("AliasToWeaponID", 0);
+	}
+
+	__asm
+	{
+		mov ecx, weapon
+		call addr
+		mov weaponID, eax
+	}
+#endif
 	return weaponID;
 }
 
 const char *WeaponIDToAlias(int weaponID)
 {
+	const char *alias = NULL;
+#if SOURCE_ENGINE != SE_CSGO || !defined(WIN32)
 	static ICallWrapper *pWrapper = NULL;
 
 	if (!pWrapper)
@@ -148,16 +204,30 @@ const char *WeaponIDToAlias(int weaponID)
 			retpass.size = sizeof(const char *); \
 			pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
 	}
-	const char *ret = NULL;
 	
 	unsigned char vstk[sizeof(int)];
 	unsigned char *vptr = vstk;
 
 	*(int *)vptr = GetRealWeaponID(weaponID);
 
-	pWrapper->Execute(vstk, &ret);
-
-	return ret;
+	pWrapper->Execute(vstk, &alias);
+#else
+	static void *addr = NULL;
+
+	if(!addr)
+	{
+		GET_MEMSIG("WeaponIDToAlias", 0);
+	}
+
+	int realWeaponID = GetRealWeaponID(weaponID);
+	__asm
+	{
+		mov ecx, realWeaponID
+		call addr
+		mov alias, eax
+	}
+#endif
+	return alias;
 }
 int GetRealWeaponID(int weaponId)
 {

extensions/curl/AMBuilder

@@ -1,87 +1,24 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python : 
-import os.path
-import subprocess
-import ambuild.command as command
-import ambuild.osutil as osutil
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python : 
+import os
 
-def BuildCURL():
-	curl = AMBuild.AddJob('curl')
-	if AMBuild.target['platform'] in ['linux', 'darwin']:
-		if not osutil.FileExists(os.path.join(AMBuild.outputFolder, 'curl', 'Makefile')):
-			args = ['/bin/bash',
-							os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'configure'),
-							'--enable-static',
-							'--disable-shared',
-							'--disable-ldap',
-							'--without-ssl',
-							'--without-libidn',
-							'--without-libssh2',
-							'--without-zlib']
-			env = os.environ.copy()
-			env['CFLAGS'] = '-m32'
-			if AMBuild.target['platform'] == 'darwin':
-				env['LDFLAGS'] = '-mmacosx-version-min=10.5'
-			else:
-				env['CFLAGS'] += ' -D_GNU_SOURCE'
-			curl.AddCommand(command.DirectCommand(argv = args, env = env))
-			curl.AddCommand(command.ShellCommand('cd lib && make'))
-	else:
-		args = ''
-		projpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
-		                    'build_libcurl.vcproj')
-		try:
-			subprocess.Popen('vcbuild')
-		except:
-			xprojpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
-		                    'build_libcurl.vcxproj')
-			if not os.path.isfile(xprojpath):
-				curl.AddCommand(command.DirectCommand(['vcupgrade', projpath]))
-			args = ['msbuild', xprojpath, '/p:Configuration=LIB Release']
-			
-		if not args:
-			args = ['vcbuild', projpath, 'LIB Release']
-		
-		curl.AddCommand(command.DirectCommand(args))
-		#die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib");
+libcurl = builder.RunScript('curl-src/lib/AMBuilder')
 
-BuildCURL()
+binary = SM.ExtLibrary(builder, 'webternet.ext')
+binary.compiler.includes += [
+  os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
+]
+binary.compiler.defines += ['CURL_STATICLIB']
+binary.compiler.postlink += [libcurl.binary]
+if builder.target_platform == 'linux':
+  binary.compiler.postlink += ['-lrt']
+elif builder.target_platform == 'windows':
+  binary.compiler.postlink += ['ws2_32.lib']
 
-compiler = SM.DefaultExtCompiler('extensions/curl')
-extension = AMBuild.AddJob('webternet.ext')
-binary = Cpp.LibraryBuilder('webternet.ext', AMBuild, extension, compiler)
+binary.sources += [
+  'extension.cpp',
+  'curlapi.cpp',
+  'sdk/smsdk_ext.cpp',
+]
 
-curlPath = [AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'include']
-compiler['CXXINCLUDES'].append(os.path.join(*curlPath))
-compiler['CDEFINES'].append('CURL_STATICLIB')
-                                          
-binary.AddSourceFiles('extensions/curl', [
-	'extension.cpp',
-	'curlapi.cpp',
-	'sdk/smsdk_ext.cpp',
-	])
-
-if AMBuild.target['platform'] == 'linux' or AMBuild.target['platform'] == 'darwin':
-	path = os.path.join(AMBuild.outputFolder,
-                      'curl',
-                      'lib',
-                      '.libs',
-                      'libcurl.a')
-	if AMBuild.target['platform'] == 'linux':
-		binary['POSTLINKFLAGS'].append('-lrt')
-	binary.AddObjectFiles([path])
-elif AMBuild.target['platform'] == 'windows':
-	path = os.path.join(AMBuild.sourceFolder,
-	                    'extensions',
-	                    'curl',
-	                    'curl-src',
-	                    'lib',
-	                    'LIB-Release',
-	                    'libcurl.lib')
-	if os.path.isfile(path):
-		binary.RelinkIfNewer(path)
-	binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib'])
-
-SM.AutoVersion('extensions/curl', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+SM.extensions += [builder.Add(binary)]
 

extensions/curl/curl-src/lib/AMBuilder

@@ -0,0 +1,94 @@
+# vim: sts=2 ts=8 sw=2 tw=99 et ft=python: 
+import os, platform
+
+builder.SetBuildFolder('libcurl')
+
+binary = builder.compiler.StaticLibrary('curl')
+binary.compiler.includes += [
+  os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'lib'),
+  os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
+]
+
+if builder.target_platform == 'mac':
+  mac_version, ignore, ignore = platform.mac_ver()
+  mac_tuple = mac_version.split('.')
+  if int(mac_tuple[0]) >= 10 and int(mac_tuple[1]) >= 9:
+    binary.compiler.defines += ['BUILTIN_STRLCAT']
+elif builder.target_platform == 'windows':
+  binary.compiler.defines += [
+    'BUILDING_LIBCURL',
+    'CURL_STATICLIB',
+    'CURL_DISABLE_LDAP',
+  ]
+elif builder.target_platform == 'linux':
+  binary.compiler.defines += ['_GNU_SOURCE']
+
+binary.sources += [
+  'base64.c',
+  'connect.c',
+  'content_encoding.c',
+  'cookie.c',
+  'curl_addrinfo.c',
+  'dict.c',
+  'easy.c',
+  'escape.c',
+  'file.c',
+  'formdata.c',
+  'ftp.c',
+  'getenv.c',
+  'getinfo.c',
+  'gtls.c',
+  'hash.c',
+  'hostares.c',
+  'hostasyn.c',
+  'hostip.c',
+  'hostip4.c',
+  'hostip6.c',
+  'hostsyn.c',
+  'hostthre.c',
+  'http.c',
+  'http_chunks.c',
+  'http_digest.c',
+  'http_negotiate.c',
+  'http_ntlm.c',
+  'if2ip.c',
+  'inet_ntop.c',
+  'inet_pton.c',
+  'krb4.c',
+  'krb5.c',
+  'ldap.c',
+  'llist.c',
+  'md5.c',
+  'memdebug.c',
+  'mprintf.c',
+  'multi.c',
+  'netrc.c',
+  'nss.c',
+  'parsedate.c',
+  'progress.c',
+  'qssl.c',
+  'rawstr.c',
+  'security.c',
+  'select.c',
+  'sendf.c',
+  'share.c',
+  'socks.c',
+  'speedcheck.c',
+  'splay.c',
+  'ssh.c',
+  'sslgen.c',
+  'ssluse.c',
+  'strdup.c',
+  'strequal.c',
+  'strerror.c',
+  'strtok.c',
+  'strtoofft.c',
+  'telnet.c',
+  'tftp.c',
+  'timeval.c',
+  'transfer.c',
+  'url.c',
+  'version.c'
+]
+rvalue = builder.Add(binary)
+

extensions/curl/curl-src/lib/config-sm-linux.h

@@ -0,0 +1,918 @@
+/* lib/config.h.  Generated from config.h.in by configure.  */
+/* lib/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the $func function. */
+/* #undef AS_TR_CPP */
+
+/* when building libcurl itself */
+/* #undef BUILDING_LIBCURL */
+
+/* Location of default ca bundle */
+#define CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
+
+/* Location of default ca path */
+/* #undef CURL_CA_PATH */
+
+/* to disable cookies support */
+/* #undef CURL_DISABLE_COOKIES */
+
+/* to disable cryptographic authentication */
+/* #undef CURL_DISABLE_CRYPTO_AUTH */
+
+/* to disable DICT */
+/* #undef CURL_DISABLE_DICT */
+
+/* to disable FILE */
+/* #undef CURL_DISABLE_FILE */
+
+/* to disable FTP */
+/* #undef CURL_DISABLE_FTP */
+
+/* to disable HTTP */
+/* #undef CURL_DISABLE_HTTP */
+
+/* to disable LDAP */
+#define CURL_DISABLE_LDAP 1
+
+/* to disable LDAPS */
+#define CURL_DISABLE_LDAPS 1
+
+/* to disable proxies */
+/* #undef CURL_DISABLE_PROXY */
+
+/* to disable TELNET */
+/* #undef CURL_DISABLE_TELNET */
+
+/* to disable TFTP */
+/* #undef CURL_DISABLE_TFTP */
+
+/* to disable verbose strings */
+/* #undef CURL_DISABLE_VERBOSE_STRINGS */
+
+/* to make a symbol visible */
+/* #undef CURL_EXTERN_SYMBOL */
+
+/* to enable hidden symbols */
+/* #undef CURL_HIDDEN_SYMBOLS */
+
+/* W$ LDAP with non-W$ compiler */
+/* #undef CURL_LDAP_HYBRID */
+
+/* Use W$ LDAP implementation */
+/* #undef CURL_LDAP_WIN */
+
+/* when not building a shared library */
+/* #undef CURL_STATICLIB */
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+/* #undef DISABLED_THREADSAFE */
+
+/* your Entropy Gathering Daemon socket pathname */
+/* #undef EGD_SOCKET */
+
+/* Define if you want to enable IPv6 support */
+#define ENABLE_IPV6 1
+
+/* Define to the type qualifier of arg 1 for getnameinfo. */
+#define GETNAMEINFO_QUAL_ARG1 const
+
+/* Define to the type of arg 1 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
+
+/* Define to the type of arg 2 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG2 socklen_t
+
+/* Define to the type of args 4 and 6 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG46 size_t
+
+/* Define to the type of arg 7 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG7 unsigned int
+
+/* Specifies the number of arguments to getservbyport_r */
+#define GETSERVBYPORT_R_ARGS 6
+
+/* Specifies the size of the buffer to pass to getservbyport_r */
+#define GETSERVBYPORT_R_BUFSIZE 4096
+
+/* Define to 1 if you have the alarm function. */
+#define HAVE_ALARM 1
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#define HAVE_ALLOCA_H 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <arpa/tftp.h> header file. */
+#define HAVE_ARPA_TFTP_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `basename' function. */
+#define HAVE_BASENAME 1
+
+/* Define to 1 if bool is an available type. */
+#define HAVE_BOOL_T 1
+
+/* Define to 1 if you have the clock_gettime function and monotonic timer. */
+#define HAVE_CLOCK_GETTIME_MONOTONIC 1
+
+/* Define to 1 if you have the `closesocket' function. */
+/* #undef HAVE_CLOSESOCKET */
+
+/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
+/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */
+
+/* Define to 1 if you have the <crypto.h> header file. */
+/* #undef HAVE_CRYPTO_H */
+
+/* Define to 1 if you have the <des.h> header file. */
+/* #undef HAVE_DES_H */
+
+/* disabled non-blocking sockets */
+/* #undef HAVE_DISABLED_NONBLOCKING */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
+/* #undef HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <err.h> header file. */
+/* #undef HAVE_ERR_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the fdopen function. */
+#define HAVE_FDOPEN 1
+
+/* use FIONBIO for non-blocking sockets */
+/* #undef HAVE_FIONBIO */
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the freeaddrinfo function. */
+#define HAVE_FREEADDRINFO 1
+
+/* Define to 1 if you have the freeifaddrs function. */
+#define HAVE_FREEIFADDRS 1
+
+/* Define to 1 if you have the ftruncate function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define to 1 if you have a working getaddrinfo function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `gethostbyaddr' function. */
+#define HAVE_GETHOSTBYADDR 1
+
+/* Define to 1 if you have the gethostbyaddr_r function. */
+#define HAVE_GETHOSTBYADDR_R 1
+
+/* gethostbyaddr_r() takes 5 args */
+/* #undef HAVE_GETHOSTBYADDR_R_5 */
+
+/* gethostbyaddr_r() takes 7 args */
+/* #undef HAVE_GETHOSTBYADDR_R_7 */
+
+/* gethostbyaddr_r() takes 8 args */
+#define HAVE_GETHOSTBYADDR_R_8 1
+
+/* If you have gethostbyname */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the gethostbyname_r function. */
+#define HAVE_GETHOSTBYNAME_R 1
+
+/* gethostbyname_r() takes 3 args */
+/* #undef HAVE_GETHOSTBYNAME_R_3 */
+
+/* gethostbyname_r() takes 5 args */
+/* #undef HAVE_GETHOSTBYNAME_R_5 */
+
+/* gethostbyname_r() takes 6 args */
+#define HAVE_GETHOSTBYNAME_R_6 1
+
+/* Define to 1 if you have the gethostname function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have a working getifaddrs function. */
+#define HAVE_GETIFADDRS 1
+
+/* Define to 1 if you have the getnameinfo function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getpass_r' function. */
+/* #undef HAVE_GETPASS_R */
+
+/* Define to 1 if you have the `getppid' function. */
+#define HAVE_GETPPID 1
+
+/* Define to 1 if you have the `getprotobyname' function. */
+#define HAVE_GETPROTOBYNAME 1
+
+/* Define to 1 if you have the `getpwuid' function. */
+#define HAVE_GETPWUID 1
+
+/* Define to 1 if you have the `getrlimit' function. */
+#define HAVE_GETRLIMIT 1
+
+/* Define to 1 if you have the getservbyport_r function. */
+#define HAVE_GETSERVBYPORT_R 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have a working glibc-style strerror_r function. */
+/* #undef HAVE_GLIBC_STRERROR_R */
+
+/* Define to 1 if you have a working gmtime_r function. */
+#define HAVE_GMTIME_R 1
+
+/* if you have the gssapi libraries */
+/* #undef HAVE_GSSAPI */
+
+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
+
+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_H */
+
+/* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
+
+/* if you have the GNU gssapi libraries */
+/* #undef HAVE_GSSGNU */
+
+/* if you have the Heimdal gssapi libraries */
+/* #undef HAVE_GSSHEIMDAL */
+
+/* if you have the MIT gssapi libraries */
+/* #undef HAVE_GSSMIT */
+
+/* Define to 1 if you have the `idna_strerror' function. */
+/* #undef HAVE_IDNA_STRERROR */
+
+/* Define to 1 if you have the `idn_free' function. */
+/* #undef HAVE_IDN_FREE */
+
+/* Define to 1 if you have the <idn-free.h> header file. */
+/* #undef HAVE_IDN_FREE_H */
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define to 1 if you have the `inet_addr' function. */
+#define HAVE_INET_ADDR 1
+
+/* Define to 1 if you have the inet_ntoa_r function. */
+/* #undef HAVE_INET_NTOA_R */
+
+/* inet_ntoa_r() takes 2 args */
+/* #undef HAVE_INET_NTOA_R_2 */
+
+/* inet_ntoa_r() takes 3 args */
+/* #undef HAVE_INET_NTOA_R_3 */
+
+/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
+/* #undef HAVE_INET_NTOP */
+
+/* Define to 1 if you have a IPv6 capable working inet_pton function. */
+/* #undef HAVE_INET_PTON */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* use ioctlsocket() for non-blocking sockets */
+/* #undef HAVE_IOCTLSOCKET */
+
+/* use Ioctlsocket() for non-blocking sockets */
+/* #undef HAVE_IOCTLSOCKET_CASE */
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* if you have the Kerberos4 libraries (including -ldes) */
+/* #undef HAVE_KRB4 */
+
+/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
+/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
+
+/* Define to 1 if you have the <krb.h> header file. */
+/* #undef HAVE_KRB_H */
+
+/* Define to 1 if you have the lber.h header file. */
+/* #undef HAVE_LBER_H */
+
+/* Define to 1 if you have the ldapssl.h header file. */
+/* #undef HAVE_LDAPSSL_H */
+
+/* Define to 1 if you have the ldap.h header file. */
+/* #undef HAVE_LDAP_H */
+
+/* Use LDAPS implementation */
+/* #undef HAVE_LDAP_SSL */
+
+/* Define to 1 if you have the ldap_ssl.h header file. */
+/* #undef HAVE_LDAP_SSL_H */
+
+/* Define to 1 if you have the `ldap_url_parse' function. */
+/* #undef HAVE_LDAP_URL_PARSE */
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#define HAVE_LIBGEN_H 1
+
+/* Define to 1 if you have the `idn' library (-lidn). */
+/* #undef HAVE_LIBIDN */
+
+/* Define to 1 if you have the `resolv' library (-lresolv). */
+/* #undef HAVE_LIBRESOLV */
+
+/* Define to 1 if you have the `resolve' library (-lresolve). */
+/* #undef HAVE_LIBRESOLVE */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the `ssh2' library (-lssh2). */
+/* #undef HAVE_LIBSSH2 */
+
+/* Define to 1 if you have the <libssh2.h> header file. */
+/* #undef HAVE_LIBSSH2_H */
+
+/* Define to 1 if you have the `ssl' library (-lssl). */
+/* #undef HAVE_LIBSSL */
+
+/* if zlib is available */
+/* #undef HAVE_LIBZ */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* if your compiler supports LL */
+#define HAVE_LL 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have a working localtime_r function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if the compiler supports the 'long long' data type. */
+#define HAVE_LONGLONG 1
+
+/* Define to 1 if you have the malloc.h header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the MSG_NOSIGNAL flag. */
+#define HAVE_MSG_NOSIGNAL 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if NI_WITHSCOPEID exists and works. */
+/* #undef HAVE_NI_WITHSCOPEID */
+
+/* if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE
+   */
+/* #undef HAVE_OLD_GSSMIT */
+
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
+/* #undef HAVE_OPENSSL_CRYPTO_H */
+
+/* Define to 1 if you have the <openssl/engine.h> header file. */
+/* #undef HAVE_OPENSSL_ENGINE_H */
+
+/* Define to 1 if you have the <openssl/err.h> header file. */
+/* #undef HAVE_OPENSSL_ERR_H */
+
+/* Define to 1 if you have the <openssl/pem.h> header file. */
+/* #undef HAVE_OPENSSL_PEM_H */
+
+/* Define to 1 if you have the <openssl/pkcs12.h> header file. */
+/* #undef HAVE_OPENSSL_PKCS12_H */
+
+/* Define to 1 if you have the <openssl/rsa.h> header file. */
+/* #undef HAVE_OPENSSL_RSA_H */
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+/* #undef HAVE_OPENSSL_SSL_H */
+
+/* Define to 1 if you have the <openssl/x509.h> header file. */
+/* #undef HAVE_OPENSSL_X509_H */
+
+/* use O_NONBLOCK for non-blocking sockets */
+#define HAVE_O_NONBLOCK 1
+
+/* Define to 1 if you have the <pem.h> header file. */
+/* #undef HAVE_PEM_H */
+
+/* Define to 1 if you have the `perror' function. */
+#define HAVE_PERROR 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* if you have the function PK11_CreateGenericObject */
+/* #undef HAVE_PK11_CREATEGENERICOBJECT */
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* If you have a fine poll */
+#define HAVE_POLL_FINE 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have a working POSIX-style strerror_r function. */
+#define HAVE_POSIX_STRERROR_R 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `RAND_egd' function. */
+/* #undef HAVE_RAND_EGD */
+
+/* Define to 1 if you have the `RAND_screen' function. */
+/* #undef HAVE_RAND_SCREEN */
+
+/* Define to 1 if you have the `RAND_status' function. */
+/* #undef HAVE_RAND_STATUS */
+
+/* Define to 1 if you have the recv function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the recvfrom function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the <rsa.h> header file. */
+/* #undef HAVE_RSA_H */
+
+/* Define to 1 if you have the select function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the send function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the <setjmp.h> header file. */
+#define HAVE_SETJMP_H 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `setmode' function. */
+/* #undef HAVE_SETMODE */
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H 1
+
+/* Define to 1 if you have the sigaction function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the siginterrupt function. */
+#define HAVE_SIGINTERRUPT 1
+
+/* Define to 1 if you have the signal function. */
+#define HAVE_SIGNAL 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if you have the sigsetjmp function or macro. */
+#define HAVE_SIGSETJMP 1
+
+/* Define to 1 if sig_atomic_t is an available typedef. */
+#define HAVE_SIG_ATOMIC_T 1
+
+/* Define to 1 if sig_atomic_t is already defined as volatile. */
+/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* use SO_NONBLOCK for non-blocking sockets */
+/* #undef HAVE_SO_NONBLOCK */
+
+/* Define this if you have the SPNEGO library fbopenssl */
+/* #undef HAVE_SPNEGO */
+
+/* Define to 1 if you have the `SSL_get_shutdown' function. */
+/* #undef HAVE_SSL_GET_SHUTDOWN */
+
+/* Define to 1 if you have the <ssl.h> header file. */
+/* #undef HAVE_SSL_H */
+
+/* Define to 1 if you have the <stdbool.h> header file. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strcasecmp function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the strcasestr function. */
+/* #undef HAVE_STRCASESTR */
+
+/* Define to 1 if you have the strcmpi function. */
+/* #undef HAVE_STRCMPI */
+
+/* Define to 1 if you have the strdup function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the strerror_r function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the stricmp function. */
+/* #undef HAVE_STRICMP */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the strlcat function. */
+/* #undef HAVE_STRLCAT */
+
+/* Define to 1 if you have the `strlcpy' function. */
+/* #undef HAVE_STRLCPY */
+
+/* Define to 1 if you have the strncasecmp function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the strncmpi function. */
+/* #undef HAVE_STRNCMPI */
+
+/* Define to 1 if you have the strnicmp function. */
+/* #undef HAVE_STRNICMP */
+
+/* Define to 1 if you have the strstr function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the strtok_r function. */
+#define HAVE_STRTOK_R 1
+
+/* Define to 1 if you have the strtoll function. */
+#define HAVE_STRTOLL 1
+
+/* if struct sockaddr_storage is defined */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if you have the timeval struct. */
+#define HAVE_STRUCT_TIMEVAL 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+/* #undef HAVE_SYS_SOCKIO_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/utime.h> header file. */
+/* #undef HAVE_SYS_UTIME_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the <termio.h> header file. */
+#define HAVE_TERMIO_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <tld.h> header file. */
+/* #undef HAVE_TLD_H */
+
+/* Define to 1 if you have the `tld_strerror' function. */
+/* #undef HAVE_TLD_STRERROR */
+
+/* Define to 1 if you have the `uname' function. */
+#define HAVE_UNAME 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `utime' function. */
+#define HAVE_UTIME 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* Define to 1 if compiler supports C99 variadic macro style. */
+#define HAVE_VARIADIC_MACROS_C99 1
+
+/* Define to 1 if compiler supports old gcc variadic macro style. */
+#define HAVE_VARIADIC_MACROS_GCC 1
+
+/* Define to 1 if you have the winber.h header file. */
+/* #undef HAVE_WINBER_H */
+
+/* Define to 1 if you have the windows.h header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the winldap.h header file. */
+/* #undef HAVE_WINLDAP_H */
+
+/* Define to 1 if you have the winsock2.h header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the winsock.h header file. */
+/* #undef HAVE_WINSOCK_H */
+
+/* Define this symbol if your OS supports changing the contents of argv */
+#define HAVE_WRITABLE_ARGV 1
+
+/* Define to 1 if you have the writev function. */
+#define HAVE_WRITEV 1
+
+/* Define to 1 if you have the ws2tcpip.h header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Define to 1 if you have the <x509.h> header file. */
+/* #undef HAVE_X509_H */
+
+/* if you have the zlib.h header file */
+/* #undef HAVE_ZLIB_H */
+
+/* Define to 1 if you are building a native Windows target. */
+/* #undef NATIVE_WINDOWS */
+
+/* If you lack a fine basename() prototype */
+/* #undef NEED_BASENAME_PROTO */
+
+/* Define to 1 if you need the lber.h header file even with ldap.h */
+/* #undef NEED_LBER_H */
+
+/* Define to 1 if you need the malloc.h header file even with stdlib.h */
+/* #undef NEED_MALLOC_H */
+
+/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
+/* #undef NEED_REENTRANT */
+
+/* cpu-machine-OS */
+#define OS "x86_64-unknown-linux-gnu"
+
+/* Name of package */
+#define PACKAGE "curl"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "curl"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "curl -"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "curl"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "-"
+
+/* a suitable file to read random data from */
+/* #undef RANDOM_FILE */
+
+/* Define to the type of arg 1 for recvfrom. */
+#define RECVFROM_TYPE_ARG1 int
+
+/* Define to the type pointed by arg 2 for recvfrom. */
+#define RECVFROM_TYPE_ARG2 void
+
+/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
+#define RECVFROM_TYPE_ARG2_IS_VOID 1
+
+/* Define to the type of arg 3 for recvfrom. */
+#define RECVFROM_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for recvfrom. */
+#define RECVFROM_TYPE_ARG4 int
+
+/* Define to the type pointed by arg 5 for recvfrom. */
+#define RECVFROM_TYPE_ARG5 struct sockaddr
+
+/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
+/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
+
+/* Define to the type pointed by arg 6 for recvfrom. */
+#define RECVFROM_TYPE_ARG6 socklen_t
+
+/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
+/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
+
+/* Define to the function return type for recvfrom. */
+#define RECVFROM_TYPE_RETV int
+
+/* Define to the type of arg 1 for recv. */
+#define RECV_TYPE_ARG1 int
+
+/* Define to the type of arg 2 for recv. */
+#define RECV_TYPE_ARG2 void *
+
+/* Define to the type of arg 3 for recv. */
+#define RECV_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for recv. */
+#define RECV_TYPE_ARG4 int
+
+/* Define to the function return type for recv. */
+#define RECV_TYPE_RETV int
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to the type qualifier of arg 5 for select. */
+#define SELECT_QUAL_ARG5 
+
+/* Define to the type of arg 1 for select. */
+#define SELECT_TYPE_ARG1 int
+
+/* Define to the type of args 2, 3 and 4 for select. */
+#define SELECT_TYPE_ARG234 fd_set *
+
+/* Define to the type of arg 5 for select. */
+#define SELECT_TYPE_ARG5 struct timeval *
+
+/* Define to the function return type for select. */
+#define SELECT_TYPE_RETV int
+
+/* Define to the type qualifier of arg 2 for send. */
+#define SEND_QUAL_ARG2 const
+
+/* Define to the type of arg 1 for send. */
+#define SEND_TYPE_ARG1 int
+
+/* Define to the type of arg 2 for send. */
+#define SEND_TYPE_ARG2 void *
+
+/* Define to the type of arg 3 for send. */
+#define SEND_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for send. */
+#define SEND_TYPE_ARG4 int
+
+/* Define to the function return type for send. */
+#define SEND_TYPE_RETV int
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `off_t', as computed by sizeof. */
+#define SIZEOF_OFF_T 8
+
+/* The size of `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* The size of `time_t', as computed by sizeof. */
+#define SIZEOF_TIME_T 4
+
+/* The size of `void*', as computed by sizeof. */
+#define SIZEOF_VOIDP 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to the type of arg 3 for strerror_r. */
+#define STRERROR_R_TYPE_ARG3 size_t
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define if you want to enable c-ares support */
+/* #undef USE_ARES */
+
+/* if GnuTLS is enabled */
+/* #undef USE_GNUTLS */
+
+/* if libSSH2 is in use */
+/* #undef USE_LIBSSH2 */
+
+/* If you want to build curl with the built-in manual */
+#define USE_MANUAL 1
+
+/* if NSS is enabled */
+/* #undef USE_NSS */
+
+/* if OpenSSL is in use */
+/* #undef USE_OPENSSL */
+
+/* if SSL is enabled */
+/* #undef USE_SSLEAY */
+
+/* Define to 1 if you are building a Windows target without large file
+   support. */
+/* #undef USE_WIN32_LARGE_FILES */
+
+/* to enable SSPI support */
+/* #undef USE_WINDOWS_SSPI */
+
+/* Define to 1 if using yaSSL in OpenSSL compatibility mode. */
+/* #undef USE_YASSLEMUL */
+
+/* Version number of package */
+#define VERSION "7.19.2"
+
+/* Define to avoid automatic inclusion of winsock.h */
+/* #undef WIN32_LEAN_AND_MEAN */
+
+/* Define to 1 if OS is AIX. */
+#ifndef _ALL_SOURCE
+/* #  undef _ALL_SOURCE */
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#define _FILE_OFFSET_BITS 64
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* define this if you need it to compile thread-safe code */
+/* #undef _THREAD_SAFE */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Type to use in place of in_addr_t when system does not provide it. */
+/* #undef in_addr_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Type to use in place of socklen_t when system does not provide it. */
+/* #undef socklen_t */
+
+/* the signed version of size_t */
+/* #undef ssize_t */

extensions/curl/curl-src/lib/config-sm-mac.h

@@ -0,0 +1,918 @@
+/* lib/config.h.  Generated from config.h.in by configure.  */
+/* lib/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the $func function. */
+/* #undef AS_TR_CPP */
+
+/* when building libcurl itself */
+/* #undef BUILDING_LIBCURL */
+
+/* Location of default ca bundle */
+/* #undef CURL_CA_BUNDLE */
+
+/* Location of default ca path */
+/* #undef CURL_CA_PATH */
+
+/* to disable cookies support */
+/* #undef CURL_DISABLE_COOKIES */
+
+/* to disable cryptographic authentication */
+/* #undef CURL_DISABLE_CRYPTO_AUTH */
+
+/* to disable DICT */
+/* #undef CURL_DISABLE_DICT */
+
+/* to disable FILE */
+/* #undef CURL_DISABLE_FILE */
+
+/* to disable FTP */
+/* #undef CURL_DISABLE_FTP */
+
+/* to disable HTTP */
+/* #undef CURL_DISABLE_HTTP */
+
+/* to disable LDAP */
+#define CURL_DISABLE_LDAP 1
+
+/* to disable LDAPS */
+#define CURL_DISABLE_LDAPS 1
+
+/* to disable proxies */
+/* #undef CURL_DISABLE_PROXY */
+
+/* to disable TELNET */
+/* #undef CURL_DISABLE_TELNET */
+
+/* to disable TFTP */
+/* #undef CURL_DISABLE_TFTP */
+
+/* to disable verbose strings */
+/* #undef CURL_DISABLE_VERBOSE_STRINGS */
+
+/* to make a symbol visible */
+/* #undef CURL_EXTERN_SYMBOL */
+
+/* to enable hidden symbols */
+/* #undef CURL_HIDDEN_SYMBOLS */
+
+/* W$ LDAP with non-W$ compiler */
+/* #undef CURL_LDAP_HYBRID */
+
+/* Use W$ LDAP implementation */
+/* #undef CURL_LDAP_WIN */
+
+/* when not building a shared library */
+/* #undef CURL_STATICLIB */
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+/* #undef DISABLED_THREADSAFE */
+
+/* your Entropy Gathering Daemon socket pathname */
+/* #undef EGD_SOCKET */
+
+/* Define if you want to enable IPv6 support */
+#define ENABLE_IPV6 1
+
+/* Define to the type qualifier of arg 1 for getnameinfo. */
+#define GETNAMEINFO_QUAL_ARG1 const
+
+/* Define to the type of arg 1 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
+
+/* Define to the type of arg 2 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG2 socklen_t
+
+/* Define to the type of args 4 and 6 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG46 socklen_t
+
+/* Define to the type of arg 7 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG7 int
+
+/* Specifies the number of arguments to getservbyport_r */
+/* #undef GETSERVBYPORT_R_ARGS */
+
+/* Specifies the size of the buffer to pass to getservbyport_r */
+/* #undef GETSERVBYPORT_R_BUFSIZE */
+
+/* Define to 1 if you have the alarm function. */
+#define HAVE_ALARM 1
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#define HAVE_ALLOCA_H 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <arpa/tftp.h> header file. */
+#define HAVE_ARPA_TFTP_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `basename' function. */
+#define HAVE_BASENAME 1
+
+/* Define to 1 if bool is an available type. */
+#define HAVE_BOOL_T 1
+
+/* Define to 1 if you have the clock_gettime function and monotonic timer. */
+/* #undef HAVE_CLOCK_GETTIME_MONOTONIC */
+
+/* Define to 1 if you have the `closesocket' function. */
+/* #undef HAVE_CLOSESOCKET */
+
+/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
+/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */
+
+/* Define to 1 if you have the <crypto.h> header file. */
+/* #undef HAVE_CRYPTO_H */
+
+/* Define to 1 if you have the <des.h> header file. */
+/* #undef HAVE_DES_H */
+
+/* disabled non-blocking sockets */
+/* #undef HAVE_DISABLED_NONBLOCKING */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
+/* #undef HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <err.h> header file. */
+/* #undef HAVE_ERR_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the fdopen function. */
+#define HAVE_FDOPEN 1
+
+/* use FIONBIO for non-blocking sockets */
+/* #undef HAVE_FIONBIO */
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the freeaddrinfo function. */
+#define HAVE_FREEADDRINFO 1
+
+/* Define to 1 if you have the freeifaddrs function. */
+#define HAVE_FREEIFADDRS 1
+
+/* Define to 1 if you have the ftruncate function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define to 1 if you have a working getaddrinfo function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `gethostbyaddr' function. */
+#define HAVE_GETHOSTBYADDR 1
+
+/* Define to 1 if you have the gethostbyaddr_r function. */
+/* #undef HAVE_GETHOSTBYADDR_R */
+
+/* gethostbyaddr_r() takes 5 args */
+/* #undef HAVE_GETHOSTBYADDR_R_5 */
+
+/* gethostbyaddr_r() takes 7 args */
+/* #undef HAVE_GETHOSTBYADDR_R_7 */
+
+/* gethostbyaddr_r() takes 8 args */
+/* #undef HAVE_GETHOSTBYADDR_R_8 */
+
+/* If you have gethostbyname */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the gethostbyname_r function. */
+/* #undef HAVE_GETHOSTBYNAME_R */
+
+/* gethostbyname_r() takes 3 args */
+/* #undef HAVE_GETHOSTBYNAME_R_3 */
+
+/* gethostbyname_r() takes 5 args */
+/* #undef HAVE_GETHOSTBYNAME_R_5 */
+
+/* gethostbyname_r() takes 6 args */
+/* #undef HAVE_GETHOSTBYNAME_R_6 */
+
+/* Define to 1 if you have the gethostname function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have a working getifaddrs function. */
+#define HAVE_GETIFADDRS 1
+
+/* Define to 1 if you have the getnameinfo function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getpass_r' function. */
+/* #undef HAVE_GETPASS_R */
+
+/* Define to 1 if you have the `getppid' function. */
+#define HAVE_GETPPID 1
+
+/* Define to 1 if you have the `getprotobyname' function. */
+#define HAVE_GETPROTOBYNAME 1
+
+/* Define to 1 if you have the `getpwuid' function. */
+#define HAVE_GETPWUID 1
+
+/* Define to 1 if you have the `getrlimit' function. */
+#define HAVE_GETRLIMIT 1
+
+/* Define to 1 if you have the getservbyport_r function. */
+/* #undef HAVE_GETSERVBYPORT_R */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have a working glibc-style strerror_r function. */
+/* #undef HAVE_GLIBC_STRERROR_R */
+
+/* Define to 1 if you have a working gmtime_r function. */
+#define HAVE_GMTIME_R 1
+
+/* if you have the gssapi libraries */
+/* #undef HAVE_GSSAPI */
+
+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
+
+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_H */
+
+/* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
+
+/* if you have the GNU gssapi libraries */
+/* #undef HAVE_GSSGNU */
+
+/* if you have the Heimdal gssapi libraries */
+/* #undef HAVE_GSSHEIMDAL */
+
+/* if you have the MIT gssapi libraries */
+/* #undef HAVE_GSSMIT */
+
+/* Define to 1 if you have the `idna_strerror' function. */
+/* #undef HAVE_IDNA_STRERROR */
+
+/* Define to 1 if you have the `idn_free' function. */
+/* #undef HAVE_IDN_FREE */
+
+/* Define to 1 if you have the <idn-free.h> header file. */
+/* #undef HAVE_IDN_FREE_H */
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define to 1 if you have the `inet_addr' function. */
+#define HAVE_INET_ADDR 1
+
+/* Define to 1 if you have the inet_ntoa_r function. */
+/* #undef HAVE_INET_NTOA_R */
+
+/* inet_ntoa_r() takes 2 args */
+/* #undef HAVE_INET_NTOA_R_2 */
+
+/* inet_ntoa_r() takes 3 args */
+/* #undef HAVE_INET_NTOA_R_3 */
+
+/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
+/* #undef HAVE_INET_NTOP */
+
+/* Define to 1 if you have a IPv6 capable working inet_pton function. */
+/* #undef HAVE_INET_PTON */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* use ioctlsocket() for non-blocking sockets */
+/* #undef HAVE_IOCTLSOCKET */
+
+/* use Ioctlsocket() for non-blocking sockets */
+/* #undef HAVE_IOCTLSOCKET_CASE */
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* if you have the Kerberos4 libraries (including -ldes) */
+/* #undef HAVE_KRB4 */
+
+/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
+/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
+
+/* Define to 1 if you have the <krb.h> header file. */
+/* #undef HAVE_KRB_H */
+
+/* Define to 1 if you have the lber.h header file. */
+/* #undef HAVE_LBER_H */
+
+/* Define to 1 if you have the ldapssl.h header file. */
+/* #undef HAVE_LDAPSSL_H */
+
+/* Define to 1 if you have the ldap.h header file. */
+/* #undef HAVE_LDAP_H */
+
+/* Use LDAPS implementation */
+/* #undef HAVE_LDAP_SSL */
+
+/* Define to 1 if you have the ldap_ssl.h header file. */
+/* #undef HAVE_LDAP_SSL_H */
+
+/* Define to 1 if you have the `ldap_url_parse' function. */
+/* #undef HAVE_LDAP_URL_PARSE */
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#define HAVE_LIBGEN_H 1
+
+/* Define to 1 if you have the `idn' library (-lidn). */
+/* #undef HAVE_LIBIDN */
+
+/* Define to 1 if you have the `resolv' library (-lresolv). */
+/* #undef HAVE_LIBRESOLV */
+
+/* Define to 1 if you have the `resolve' library (-lresolve). */
+/* #undef HAVE_LIBRESOLVE */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the `ssh2' library (-lssh2). */
+/* #undef HAVE_LIBSSH2 */
+
+/* Define to 1 if you have the <libssh2.h> header file. */
+/* #undef HAVE_LIBSSH2_H */
+
+/* Define to 1 if you have the `ssl' library (-lssl). */
+/* #undef HAVE_LIBSSL */
+
+/* if zlib is available */
+/* #undef HAVE_LIBZ */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* if your compiler supports LL */
+#define HAVE_LL 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have a working localtime_r function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if the compiler supports the 'long long' data type. */
+#define HAVE_LONGLONG 1
+
+/* Define to 1 if you have the malloc.h header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the MSG_NOSIGNAL flag. */
+/* #undef HAVE_MSG_NOSIGNAL */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if NI_WITHSCOPEID exists and works. */
+/* #undef HAVE_NI_WITHSCOPEID */
+
+/* if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE
+   */
+/* #undef HAVE_OLD_GSSMIT */
+
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
+/* #undef HAVE_OPENSSL_CRYPTO_H */
+
+/* Define to 1 if you have the <openssl/engine.h> header file. */
+/* #undef HAVE_OPENSSL_ENGINE_H */
+
+/* Define to 1 if you have the <openssl/err.h> header file. */
+/* #undef HAVE_OPENSSL_ERR_H */
+
+/* Define to 1 if you have the <openssl/pem.h> header file. */
+/* #undef HAVE_OPENSSL_PEM_H */
+
+/* Define to 1 if you have the <openssl/pkcs12.h> header file. */
+/* #undef HAVE_OPENSSL_PKCS12_H */
+
+/* Define to 1 if you have the <openssl/rsa.h> header file. */
+/* #undef HAVE_OPENSSL_RSA_H */
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+/* #undef HAVE_OPENSSL_SSL_H */
+
+/* Define to 1 if you have the <openssl/x509.h> header file. */
+/* #undef HAVE_OPENSSL_X509_H */
+
+/* use O_NONBLOCK for non-blocking sockets */
+#define HAVE_O_NONBLOCK 1
+
+/* Define to 1 if you have the <pem.h> header file. */
+/* #undef HAVE_PEM_H */
+
+/* Define to 1 if you have the `perror' function. */
+#define HAVE_PERROR 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* if you have the function PK11_CreateGenericObject */
+/* #undef HAVE_PK11_CREATEGENERICOBJECT */
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* If you have a fine poll */
+/* #undef HAVE_POLL_FINE */
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have a working POSIX-style strerror_r function. */
+#define HAVE_POSIX_STRERROR_R 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `RAND_egd' function. */
+/* #undef HAVE_RAND_EGD */
+
+/* Define to 1 if you have the `RAND_screen' function. */
+/* #undef HAVE_RAND_SCREEN */
+
+/* Define to 1 if you have the `RAND_status' function. */
+/* #undef HAVE_RAND_STATUS */
+
+/* Define to 1 if you have the recv function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the recvfrom function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the <rsa.h> header file. */
+/* #undef HAVE_RSA_H */
+
+/* Define to 1 if you have the select function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the send function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the <setjmp.h> header file. */
+#define HAVE_SETJMP_H 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `setmode' function. */
+#define HAVE_SETMODE 1
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H 1
+
+/* Define to 1 if you have the sigaction function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the siginterrupt function. */
+#define HAVE_SIGINTERRUPT 1
+
+/* Define to 1 if you have the signal function. */
+#define HAVE_SIGNAL 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if you have the sigsetjmp function or macro. */
+#define HAVE_SIGSETJMP 1
+
+/* Define to 1 if sig_atomic_t is an available typedef. */
+#define HAVE_SIG_ATOMIC_T 1
+
+/* Define to 1 if sig_atomic_t is already defined as volatile. */
+/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* use SO_NONBLOCK for non-blocking sockets */
+/* #undef HAVE_SO_NONBLOCK */
+
+/* Define this if you have the SPNEGO library fbopenssl */
+/* #undef HAVE_SPNEGO */
+
+/* Define to 1 if you have the `SSL_get_shutdown' function. */
+/* #undef HAVE_SSL_GET_SHUTDOWN */
+
+/* Define to 1 if you have the <ssl.h> header file. */
+/* #undef HAVE_SSL_H */
+
+/* Define to 1 if you have the <stdbool.h> header file. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strcasecmp function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the strcasestr function. */
+#define HAVE_STRCASESTR 1
+
+/* Define to 1 if you have the strcmpi function. */
+/* #undef HAVE_STRCMPI */
+
+/* Define to 1 if you have the strdup function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the strerror_r function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the stricmp function. */
+/* #undef HAVE_STRICMP */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the strlcat function. */
+#define HAVE_STRLCAT 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+/* #undef HAVE_STRLCPY */
+
+/* Define to 1 if you have the strncasecmp function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the strncmpi function. */
+/* #undef HAVE_STRNCMPI */
+
+/* Define to 1 if you have the strnicmp function. */
+/* #undef HAVE_STRNICMP */
+
+/* Define to 1 if you have the strstr function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the strtok_r function. */
+#define HAVE_STRTOK_R 1
+
+/* Define to 1 if you have the strtoll function. */
+#define HAVE_STRTOLL 1
+
+/* if struct sockaddr_storage is defined */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if you have the timeval struct. */
+#define HAVE_STRUCT_TIMEVAL 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#define HAVE_SYS_FILIO_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#define HAVE_SYS_SOCKIO_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/utime.h> header file. */
+/* #undef HAVE_SYS_UTIME_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the <termio.h> header file. */
+/* #undef HAVE_TERMIO_H */
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <tld.h> header file. */
+/* #undef HAVE_TLD_H */
+
+/* Define to 1 if you have the `tld_strerror' function. */
+/* #undef HAVE_TLD_STRERROR */
+
+/* Define to 1 if you have the `uname' function. */
+#define HAVE_UNAME 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `utime' function. */
+#define HAVE_UTIME 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* Define to 1 if compiler supports C99 variadic macro style. */
+#define HAVE_VARIADIC_MACROS_C99 1
+
+/* Define to 1 if compiler supports old gcc variadic macro style. */
+#define HAVE_VARIADIC_MACROS_GCC 1
+
+/* Define to 1 if you have the winber.h header file. */
+/* #undef HAVE_WINBER_H */
+
+/* Define to 1 if you have the windows.h header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the winldap.h header file. */
+/* #undef HAVE_WINLDAP_H */
+
+/* Define to 1 if you have the winsock2.h header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the winsock.h header file. */
+/* #undef HAVE_WINSOCK_H */
+
+/* Define this symbol if your OS supports changing the contents of argv */
+#define HAVE_WRITABLE_ARGV 1
+
+/* Define to 1 if you have the writev function. */
+#define HAVE_WRITEV 1
+
+/* Define to 1 if you have the ws2tcpip.h header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Define to 1 if you have the <x509.h> header file. */
+/* #undef HAVE_X509_H */
+
+/* if you have the zlib.h header file */
+/* #undef HAVE_ZLIB_H */
+
+/* Define to 1 if you are building a native Windows target. */
+/* #undef NATIVE_WINDOWS */
+
+/* If you lack a fine basename() prototype */
+/* #undef NEED_BASENAME_PROTO */
+
+/* Define to 1 if you need the lber.h header file even with ldap.h */
+/* #undef NEED_LBER_H */
+
+/* Define to 1 if you need the malloc.h header file even with stdlib.h */
+/* #undef NEED_MALLOC_H */
+
+/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
+/* #undef NEED_REENTRANT */
+
+/* cpu-machine-OS */
+#define OS "i386-apple-darwin13.0.0"
+
+/* Name of package */
+#define PACKAGE "curl"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "curl"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "curl -"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "curl"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "-"
+
+/* a suitable file to read random data from */
+/* #undef RANDOM_FILE */
+
+/* Define to the type of arg 1 for recvfrom. */
+#define RECVFROM_TYPE_ARG1 int
+
+/* Define to the type pointed by arg 2 for recvfrom. */
+#define RECVFROM_TYPE_ARG2 void
+
+/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
+#define RECVFROM_TYPE_ARG2_IS_VOID 1
+
+/* Define to the type of arg 3 for recvfrom. */
+#define RECVFROM_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for recvfrom. */
+#define RECVFROM_TYPE_ARG4 int
+
+/* Define to the type pointed by arg 5 for recvfrom. */
+#define RECVFROM_TYPE_ARG5 struct sockaddr
+
+/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
+/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
+
+/* Define to the type pointed by arg 6 for recvfrom. */
+#define RECVFROM_TYPE_ARG6 socklen_t
+
+/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
+/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
+
+/* Define to the function return type for recvfrom. */
+#define RECVFROM_TYPE_RETV ssize_t
+
+/* Define to the type of arg 1 for recv. */
+#define RECV_TYPE_ARG1 int
+
+/* Define to the type of arg 2 for recv. */
+#define RECV_TYPE_ARG2 void *
+
+/* Define to the type of arg 3 for recv. */
+#define RECV_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for recv. */
+#define RECV_TYPE_ARG4 int
+
+/* Define to the function return type for recv. */
+#define RECV_TYPE_RETV ssize_t
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to the type qualifier of arg 5 for select. */
+#define SELECT_QUAL_ARG5 
+
+/* Define to the type of arg 1 for select. */
+#define SELECT_TYPE_ARG1 int
+
+/* Define to the type of args 2, 3 and 4 for select. */
+#define SELECT_TYPE_ARG234 fd_set *
+
+/* Define to the type of arg 5 for select. */
+#define SELECT_TYPE_ARG5 struct timeval *
+
+/* Define to the function return type for select. */
+#define SELECT_TYPE_RETV int
+
+/* Define to the type qualifier of arg 2 for send. */
+#define SEND_QUAL_ARG2 const
+
+/* Define to the type of arg 1 for send. */
+#define SEND_TYPE_ARG1 int
+
+/* Define to the type of arg 2 for send. */
+#define SEND_TYPE_ARG2 void *
+
+/* Define to the type of arg 3 for send. */
+#define SEND_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for send. */
+#define SEND_TYPE_ARG4 int
+
+/* Define to the function return type for send. */
+#define SEND_TYPE_RETV ssize_t
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `off_t', as computed by sizeof. */
+#define SIZEOF_OFF_T 8
+
+/* The size of `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* The size of `time_t', as computed by sizeof. */
+#define SIZEOF_TIME_T 4
+
+/* The size of `void*', as computed by sizeof. */
+#define SIZEOF_VOIDP 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to the type of arg 3 for strerror_r. */
+#define STRERROR_R_TYPE_ARG3 size_t
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define if you want to enable c-ares support */
+/* #undef USE_ARES */
+
+/* if GnuTLS is enabled */
+/* #undef USE_GNUTLS */
+
+/* if libSSH2 is in use */
+/* #undef USE_LIBSSH2 */
+
+/* If you want to build curl with the built-in manual */
+#define USE_MANUAL 1
+
+/* if NSS is enabled */
+/* #undef USE_NSS */
+
+/* if OpenSSL is in use */
+/* #undef USE_OPENSSL */
+
+/* if SSL is enabled */
+/* #undef USE_SSLEAY */
+
+/* Define to 1 if you are building a Windows target without large file
+   support. */
+/* #undef USE_WIN32_LARGE_FILES */
+
+/* to enable SSPI support */
+/* #undef USE_WINDOWS_SSPI */
+
+/* Define to 1 if using yaSSL in OpenSSL compatibility mode. */
+/* #undef USE_YASSLEMUL */
+
+/* Version number of package */
+#define VERSION "7.19.2"
+
+/* Define to avoid automatic inclusion of winsock.h */
+/* #undef WIN32_LEAN_AND_MEAN */
+
+/* Define to 1 if OS is AIX. */
+#ifndef _ALL_SOURCE
+/* #  undef _ALL_SOURCE */
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* define this if you need it to compile thread-safe code */
+/* #undef _THREAD_SAFE */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Type to use in place of in_addr_t when system does not provide it. */
+/* #undef in_addr_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Type to use in place of socklen_t when system does not provide it. */
+/* #undef socklen_t */
+
+/* the signed version of size_t */
+/* #undef ssize_t */

extensions/curl/curl-src/lib/setup.h

@@ -48,6 +48,12 @@
 #endif
 #endif
 
+#ifdef __linux__
+# include "config-sm-linux.h"
+#elif defined(__APPLE__)
+# include "config-sm-mac.h"
+#endif
+
 #if defined(macintosh) && defined(__MRC__)
 #  include "config-mac.h"
 #endif

extensions/curl/curl-src/lib/strequal.h

@@ -31,6 +31,8 @@
 #ifndef HAVE_STRLCAT
 #define strlcat(x,y,z) Curl_strlcat(x,y,z)
 #endif
+#if !defined(BUILTIN_STRLCAT)
 size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
 
 #endif

extensions/curl/extension.cpp

@@ -78,11 +78,11 @@ void CurlExt::SDK_OnUnload()
 
 const char *CurlExt::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *CurlExt::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

extensions/geoip/AMBuilder

@@ -1,16 +1,15 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
-compiler = SM.DefaultExtCompiler('extensions/geoip')
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os
 
-extension = AMBuild.AddJob('geoip.ext')
-binary = Cpp.LibraryBuilder('geoip.ext', AMBuild, extension, compiler)
-binary.AddSourceFiles('extensions/geoip', [
-	'extension.cpp',
-	'GeoIP.c',
-	'sdk/smsdk_ext.cpp'
-	])
-if AMBuild.target['platform'] == 'windows':
-	binary['POSTLINKFLAGS'].append('wsock32.lib')
-SM.AutoVersion('extensions/geoip', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary = SM.ExtLibrary(builder, 'geoip.ext')
+if builder.target_platform == 'windows':
+  binary.compiler.postlink += ['wsock32.lib']
+
+binary.sources += [
+  'extension.cpp',
+  'GeoIP.c',
+  'sdk/smsdk_ext.cpp'
+]
+
+SM.extensions += [builder.Add(binary)]
 

extensions/geoip/extension.cpp

@@ -70,12 +70,12 @@ void GeoIP_Extension::SDK_OnUnload()
 
 const char *GeoIP_Extension::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *GeoIP_Extension::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 
 /*******************************

extensions/mysql/AMBuilder

@@ -1,39 +1,35 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/mysql')
-compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['MYSQL5'], 'include'))
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+if SM.mysql_root:
+  binary = SM.ExtLibrary(builder, 'dbi.mysql.ext')
+  binary.compiler.cxxincludes += [
+    os.path.join(SM.mysql_root, 'include'),
+    os.path.join(SM.mms_root, 'core', 'sourcehook')
+  ]
 
-extension = AMBuild.AddJob('dbi.mysql.ext')
-binary = Cpp.LibraryBuilder('dbi.mysql.ext', AMBuild, extension, compiler)
+  if builder.target_platform == 'linux' or builder.target_platform == 'mac':
+    binary.compiler.postlink += [
+      os.path.join(SM.mysql_root, 'lib', 'libmysqlclient_r.a'),
+      '-lz',
+      '-lpthread',
+      '-lm'
+    ]
+  elif builder.target_platform == 'windows':
+    binary.compiler.postlink += [
+      os.path.join(SM.mysql_root, 'lib', 'opt', 'mysqlclient.lib'),
+      os.path.join(SM.mysql_root, 'lib', 'opt', 'zlib.lib'),
+      'wsock32.lib'
+    ]
 
-if AMBuild.target['platform'] == 'linux' or AMBuild.target['platform'] == 'darwin':
-	lib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'libmysqlclient_r.a')
-	link = [lib,
-          '-lz',
-          '-lpthread',
-          '-lm']
-	binary.RelinkIfNewer(lib)
-	binary['POSTLINKFLAGS'].extend(link)
-elif AMBuild.target['platform'] == 'windows':
-	mylib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'mysqlclient.lib')
-	zlib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'zlib.lib')
-	binary.RelinkIfNewer(mylib)
-	binary.RelinkIfNewer(zlib)
-	binary['POSTLINKFLAGS'].extend([mylib, zlib, 'wsock32.lib'])
-
-
-binary.AddSourceFiles('extensions/mysql', [
-	'sdk/smsdk_ext.cpp',
-	'mysql/MyBasicResults.cpp',
-	'mysql/MyBoundResults.cpp',
-	'mysql/MyDatabase.cpp',
-	'mysql/MyDriver.cpp',
-	'mysql/MyStatement.cpp',
-	'extension.cpp'
-	])
-SM.AutoVersion('extensions/mysql', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+  binary.sources += [
+    'sdk/smsdk_ext.cpp',
+    'mysql/MyBasicResults.cpp',
+    'mysql/MyBoundResults.cpp',
+    'mysql/MyDatabase.cpp',
+    'mysql/MyDriver.cpp',
+    'mysql/MyStatement.cpp',
+    'extension.cpp'
+  ]
+  SM.extensions += [builder.Add(binary)]
 

extensions/mysql/extension.cpp

@@ -62,11 +62,11 @@ void DBI_MySQL::SDK_OnUnload()
 
 const char *DBI_MySQL::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *DBI_MySQL::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

extensions/mysql/mysql/MyDatabase.cpp

@@ -326,3 +326,8 @@ IDBDriver *MyDatabase::GetDriver()
 {
 	return &g_MyDriver;
 }
+
+bool MyDatabase::SetCharacterSet(const char *characterset)
+{
+	return mysql_set_character_set(m_mysql, characterset) == 0 ? true : false;
+}

extensions/mysql/mysql/MyDatabase.h

@@ -62,6 +62,7 @@ public: //IDatabase
 	IQuery *DoQueryEx(const char *query, size_t len);
 	unsigned int GetAffectedRowsForQuery(IQuery *query);
 	unsigned int GetInsertIDForQuery(IQuery *query);
+	bool SetCharacterSet(const char *characterset);
 public:
 	const DatabaseInfo &GetInfo();
 private:

extensions/regex/AMBuilder

@@ -1,28 +1,24 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/regex')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+binary = SM.ExtLibrary(builder, 'regex.ext')
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+]
 
-extension = AMBuild.AddJob('regex.ext')
-binary = Cpp.LibraryBuilder('regex.ext', AMBuild, extension, compiler)
+if builder.target_platform == 'linux':
+  path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_linux', 'libpcre.a')
+elif builder.target_platform == 'windows':
+  path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_win', 'pcre.lib')
+elif builder.target_platform == 'mac':
+  path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_darwin', 'libpcre.a')
+binary.compiler.postlink += [binary.Dep(path)]
 
-if AMBuild.target['platform'] == 'linux':
-	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_linux', 'libpcre.a')
-elif AMBuild.target['platform'] == 'windows':
-	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_win', 'pcre.lib')
-elif AMBuild.target['platform'] == 'darwin':
-	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_darwin', 'libpcre.a')
+binary.sources += [
+  'extension.cpp',
+  'CRegEx.cpp',
+  'sdk/smsdk_ext.cpp',
+]
 
-binary.RelinkIfNewer(path)
-binary['POSTLINKFLAGS'].append(path)
-
-binary.AddSourceFiles('extensions/regex', [
-	'extension.cpp',
-	'CRegEx.cpp',
-	'sdk/smsdk_ext.cpp',
-	])
-SM.AutoVersion('extensions/regex', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+SM.extensions += [builder.Add(binary)]
 

extensions/regex/extension.cpp

@@ -65,12 +65,12 @@ void RegexExtension::SDK_OnUnload()
 
 const char *RegexExtension::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *RegexExtension::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 
 static cell_t CompileRegex(IPluginContext *pCtx, const cell_t *params)

extensions/sdkhooks/AMBuilder

@@ -1,31 +1,21 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for i in SM.sdkInfo:
-	sdk = SM.sdkInfo[i]
-	if AMBuild.target['platform'] not in sdk['platform']:
-		continue
-
-	compiler = SM.DefaultHL2Compiler('extensions/sdkhooks', i)
-	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'game', 'shared'))
-
-	if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang':
-		compiler['CFLAGS'].append('-Wno-parentheses')
-		compiler['CXXFLAGS'].append('-Wno-invalid-offsetof')
-
-	name = 'sdkhooks.ext.' + sdk['ext']
-	extension = AMBuild.AddJob(name)
-	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-	SM.PreSetupHL2Job(extension, binary, i)
-	binary.AddSourceFiles('extensions/sdkhooks', [
-		'extension.cpp',
-		'natives.cpp',
-		'takedamageinfohack.cpp',
-		'util.cpp',
-		'sdk/smsdk_ext.cpp',
-		])
-	SM.PostSetupHL2Job(extension, binary, i)
-	SM.AutoVersion('extensions/sdkhooks', binary)
-	SM.ExtractDebugInfo(extension, binary)
-	binary.SendToJob()
+for sdk_name in SM.sdks:
+  sdk = SM.sdks[sdk_name]
+  
+  binary = SM.HL2Library(builder, 'sdkhooks.ext.' + sdk.ext, sdk)
+  binary.compiler.cxxincludes += [
+    os.path.join(sdk.path, 'game', 'shared')
+  ]
+  if binary.compiler.cxx.behavior == 'gcc':
+    binary.compiler.cxxflags += ['-Wno-invalid-offsetof']
 
+  binary.sources += [
+    'extension.cpp',
+    'natives.cpp',
+    'takedamageinfohack.cpp',
+    'util.cpp',
+    'sdk/smsdk_ext.cpp',
+  ]
+  SM.extensions += [builder.Add(binary)]

extensions/sdkhooks/extension.cpp

@@ -118,6 +118,29 @@ IGameConfig *g_pGameConf = NULL;
 
 char g_szMapEntities[2097152];
 
+CUtlVector<IEntityListener *> *EntListeners()
+{
+	void *gEntList = gamehelpers->GetGlobalEntityList();
+	if (gEntList)
+	{
+		int offset = -1; /* 65572 */
+		if (g_pGameConf->GetOffset("EntityListeners", &offset))
+		{
+			return (CUtlVector<IEntityListener *> *)((intptr_t) gEntList + offset);
+		}
+	}
+	else
+	{
+		void *entListeners;
+		if (g_pGameConf->GetAddress("EntityListenersPtr", &entListeners))
+		{
+			return (CUtlVector<IEntityListener *> *)entListeners;
+		}
+	}
+
+	return NULL;
+}
+
 
 /**
  * IServerGameDLL & IVEngineServer Hooks
@@ -211,22 +234,14 @@ bool SDKHooks::SDK_OnLoad(char *error, size_t maxlength, bool late)
 		return false;
 	}
 
-	void *gEntList = gamehelpers->GetGlobalEntityList();
-	if (!gEntList)
+	CUtlVector<IEntityListener *> *entListeners = EntListeners();
+	if (!entListeners)
 	{
-		g_pSM->Format(error, maxlength, "Cannot find gEntList pointer");
+		g_pSM->Format(error, maxlength, "Failed to setup entity listeners");
 		return false;
 	}
 
-	int offset = -1; /* 65572 */
-	if (!g_pGameConf->GetOffset("EntityListeners", &offset))
-	{
-		g_pSM->Format(error, maxlength, "Cannot find EntityListeners offset");
-		return false;
-	}
-
-	CUtlVector<IEntityListener *> *pListeners = (CUtlVector<IEntityListener *> *)((intptr_t)gEntList + offset);
-	pListeners->AddToTail(this);
+	entListeners->AddToTail(this);
 
 	SetupHooks();
 
@@ -320,16 +335,8 @@ void SDKHooks::SDK_OnUnload()
 	sharesys->DropCapabilityProvider(myself, this, "SDKHook_DmgCustomInOTD");
 	sharesys->DropCapabilityProvider(myself, this, "SDKHook_LogicalEntSupport");
 
-	void *gEntList = gamehelpers->GetGlobalEntityList();
-	if (gEntList)
-	{
-		int offset = -1; /* 65572 */
-		if (g_pGameConf->GetOffset("EntityListeners", &offset))
-		{
-			CUtlVector<IEntityListener *> *pListeners = (CUtlVector<IEntityListener *> *)((intptr_t)gEntList + offset);
-			pListeners->FindAndRemove(this);
-		}
-	}
+	CUtlVector<IEntityListener *> *entListeners = EntListeners();
+	entListeners->FindAndRemove(this);
 
 	gameconfs->CloseGameConfigFile(g_pGameConf);
 }
@@ -350,12 +357,12 @@ bool SDKHooks::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool
 
 const char *SDKHooks::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *SDKHooks::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 
 void SDKHooks::OnPluginLoaded(IPlugin *plugin)
@@ -517,7 +524,7 @@ HookReturn SDKHooks::Hook(int entity, SDKHookType type, IPluginFunction *callbac
 	if(!g_HookTypes[type].supported)
 		return HookRet_NotSupported;
 
-	CBaseEntity *pEnt = UTIL_GetCBaseEntity(entity);
+	CBaseEntity *pEnt = gamehelpers->ReferenceToEntity(entity);
 	if(!pEnt)
 		return HookRet_InvalidEntity;
 	if(type < 0 || type >= SDKHook_MAXHOOKS)
@@ -1157,7 +1164,7 @@ bool SDKHooks::Hook_ReloadPost()
 
 		callback = g_HookList[i].callback;
 		callback->PushCell(entity);
-		callback->PushCell(META_RESULT_OVERRIDE_RET(bool) ? 1 : 0);
+		callback->PushCell(META_RESULT_ORIG_RET(bool) ? 1 : 0);
 		callback->Execute(NULL);
 	}
 

extensions/sdkhooks/natives.cpp

@@ -58,14 +58,15 @@ cell_t Native_Hook(IPluginContext *pContext, const cell_t *params)
 			break;
 		case HookRet_BadEntForHookType:
 		{
-			const char * pClassname = gamehelpers->GetEntityClassname(PEntityOfEntIndex(gamehelpers->ReferenceToIndex(params[1])));
-			if (!pClassname)
-			{
-				pContext->ThrowNativeError("Hook type not valid for this type of entity (%i).", entity);
-			}
-			else
-			{
-				pContext->ThrowNativeError("Hook type not valid for this type of entity (%s)", pClassname);
+			CBaseEntity *pEnt = gamehelpers->ReferenceToEntity(params[1]);
+			const char *pClassname = pEnt ? gamehelpers->GetEntityClassname(pEnt) : NULL;
+			if (!pClassname)
+			{
+				pContext->ThrowNativeError("Hook type not valid for this type of entity (%i).", entity);
+			}
+			else
+			{
+				pContext->ThrowNativeError("Hook type not valid for this type of entity (%i/%s)", entity, pClassname);
 			}
 			
 			break;
@@ -108,18 +109,18 @@ cell_t Native_TakeDamage(IPluginContext *pContext, const cell_t *params)
 #if !defined SH_DECL_MANUALEXTERN1
 	pContext->ThrowNativeError("SDKHooks_TakeDamage is not supported on this engine.");
 #else
-	CBaseEntity *pVictim = UTIL_GetCBaseEntity(params[1]);
+	CBaseEntity *pVictim = gamehelpers->ReferenceToEntity(params[1]);
 	if (!pVictim)
 		return pContext->ThrowNativeError("Invalid entity index %d for victim", params[1]);
 	
-	CBaseEntity *pInflictor = UTIL_GetCBaseEntity(params[2]);
+	CBaseEntity *pInflictor = gamehelpers->ReferenceToEntity(params[2]);
 	if (!pInflictor)
 		return pContext->ThrowNativeError("Invalid entity index %d for inflictor", params[2]);
 
 	CBaseEntity *pAttacker;
 	if (params[3] != -1)
 	{
-		pAttacker = UTIL_GetCBaseEntity(params[3]);
+		pAttacker = gamehelpers->ReferenceToEntity(params[3]);
 		if (!pAttacker)
 		{
 			return pContext->ThrowNativeError("Invalid entity index %d for attackerr", params[3]);
@@ -136,7 +137,7 @@ cell_t Native_TakeDamage(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pWeapon;
 	if (params[6] != -1)
 	{
-		pWeapon = UTIL_GetCBaseEntity(params[6]);
+		pWeapon = gamehelpers->ReferenceToEntity(params[6]);
 		if (!pWeapon)
 		{
 			return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[6]);
@@ -192,11 +193,15 @@ cell_t Native_DropWeapon(IPluginContext *pContext, const cell_t *params)
 #if !defined SH_DECL_MANUALEXTERN1
 	pContext->ThrowNativeError("SDKHooks_DropWeapon is not supported on this engine.");
 #else
-	CBaseEntity *pPlayer = UTIL_GetCBaseEntity(params[1], true);
+	CBaseEntity *pPlayer = gamehelpers->ReferenceToEntity(params[1]);
 	if (!pPlayer)
 		return pContext->ThrowNativeError("Invalid client index %d", params[1]);
+
+	IGamePlayer *pGamePlayer = playerhelpers->GetGamePlayer(gamehelpers->ReferenceToIndex(params[1]));
+	if (!pGamePlayer || !pGamePlayer->IsInGame())
+		return pContext->ThrowNativeError("Client index %d not in game", params[1]);
 	
-	CBaseEntity *pWeapon = UTIL_GetCBaseEntity(params[2]);
+	CBaseEntity *pWeapon = gamehelpers->ReferenceToEntity(params[2]);
 	if (!pWeapon)
 		return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]);
 

extensions/sdkhooks/takedamageinfohack.cpp

@@ -72,6 +72,7 @@ CTakeDamageInfoHack::CTakeDamageInfoHack( CBaseEntity *pInflictor, CBaseEntity *
 	m_iDamagedOtherPlayers = 0;
 	m_iPlayerPenetrationCount = 0;
 	m_flDamageBonus = 0.0f;
+	m_bForceFriendlyFire = false;
 #endif
 
 #if SOURCE_ENGINE >= SE_ALIENSWARM

extensions/sdkhooks/util.cpp

@@ -34,36 +34,6 @@
 #include "extension.h"
 #include "util.h"
 
-CBaseEntity *UTIL_GetCBaseEntity(int num, bool onlyPlayers)
-{
-	edict_t *pEdict = PEntityOfEntIndex(num);
-	if (!pEdict || pEdict->IsFree())
-	{
-		return NULL;
-	}
-
-	if (num > 0 && num <= playerhelpers->GetMaxClients())
-	{
-		IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(pEdict);
-		if (!pPlayer || !pPlayer->IsConnected())
-		{
-			return NULL;
-		}
-	}
-	else if (onlyPlayers)
-	{
-		return NULL;
-	}
-
-	IServerUnknown *pUnk;
-	if ((pUnk=pEdict->GetUnknown()) == NULL)
-	{
-		return NULL;
-	}
-
-	return pUnk->GetBaseEntity();
-}
-
 bool UTIL_FindDataTable(SendTable *pTable, 
 						  const char *name,
 						  sm_sendprop_info_t *info,

extensions/sdkhooks/util.h

@@ -34,7 +34,6 @@
 
 #include <compat_wrappers.h>
 
-CBaseEntity *UTIL_GetCBaseEntity(int num, bool onlyPlayers=false);
 bool UTIL_FindDataTable(SendTable *pTable, const char *name, sm_sendprop_info_t *info, unsigned int offset);
 
 #endif  //_INCLUDE_TF2TOOLS_UTIL_H_

extensions/sdktools/AMBuilder

@@ -1,53 +1,45 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for i in SM.sdkInfo:
-	sdk = SM.sdkInfo[i]
-	if AMBuild.target['platform'] not in sdk['platform']:
-		continue
+for sdk_name in SM.sdks:
+  sdk = SM.sdks[sdk_name]
 
-	compiler = SM.DefaultHL2Compiler('extensions/sdktools', i)
-	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit'))
-	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86'))
+  binary = SM.HL2Library(builder, 'sdktools.ext.' + sdk.ext, sdk)
+  binary.compiler.cxxincludes += [
+    os.path.join(sdk.path, 'game', 'shared'),
+    os.path.join(builder.sourcePath, 'public', 'jit'),
+    os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
+  ]
 
-	if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang':
-		compiler['CFLAGS'].append('-Wno-parentheses')
-		compiler['CXXFLAGS'].append('-Wno-invalid-offsetof')
+  if sdk.name != 'ep1':
+    binary.compiler.defines += ['HOOKING_ENABLED']
 
-	if i != 'ep1':
-		compiler['CDEFINES'].append('HOOKING_ENABLED')
-
-	name = 'sdktools.ext.' + sdk['ext']
-	extension = AMBuild.AddJob(name)
-	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-	SM.PreSetupHL2Job(extension, binary, i)
-	binary.AddSourceFiles('extensions/sdktools', [
-		'extension.cpp',
-		'inputnatives.cpp',
-		'output.cpp',
-		'outputnatives.cpp',
-		'tempents.cpp',
-		'tenatives.cpp',
-		'teamnatives.cpp',
-		'trnatives.cpp',
-		'vcaller.cpp',
-		'vcallbuilder.cpp',
-		'vdecoder.cpp',
-		'vglobals.cpp',
-		'vhelpers.cpp',
-		'vnatives.cpp',
-		'voice.cpp',
-		'vsound.cpp',
-		'clientnatives.cpp',
-		'hooks.cpp',
-		'gamerulesnatives.cpp',
-		'vstringtable.cpp',
-		'CDetour/detours.cpp',
-		'sdk/smsdk_ext.cpp',
-		'asm/asm.c'
-		])
-	SM.PostSetupHL2Job(extension, binary, i)
-	SM.AutoVersion('extensions/sdktools', binary)
-	SM.ExtractDebugInfo(extension, binary)
-	binary.SendToJob()
+  if binary.compiler.cxx.behavior == 'gcc':
+    binary.compiler.cxxflags += ['-Wno-invalid-offsetof']
 
+  binary.sources += [
+    'extension.cpp',
+    'inputnatives.cpp',
+    'output.cpp',
+    'outputnatives.cpp',
+    'tempents.cpp',
+    'tenatives.cpp',
+    'teamnatives.cpp',
+    'trnatives.cpp',
+    'vcaller.cpp',
+    'vcallbuilder.cpp',
+    'vdecoder.cpp',
+    'vglobals.cpp',
+    'vhelpers.cpp',
+    'vnatives.cpp',
+    'voice.cpp',
+    'vsound.cpp',
+    'clientnatives.cpp',
+    'hooks.cpp',
+    'gamerulesnatives.cpp',
+    'vstringtable.cpp',
+    'CDetour/detours.cpp',
+    'sdk/smsdk_ext.cpp',
+    'asm/asm.c'
+  ]
+  SM.extensions += [builder.Add(binary)]

extensions/sdktools/extension.cpp

@@ -435,12 +435,12 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
 
 const char *SDKTools::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *SDKTools::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 
 void SDKTools::OnClientPutInServer(int client)

extensions/sdktools/tempents.cpp

@@ -118,16 +118,16 @@ int TempEntityInfo::_FindOffset(const char *name, int *size)
 {
 	int offset;
 
-	SendProp *prop = g_pGameHelpers->FindInSendTable(m_Sc->GetName(), name);
-	if (!prop)
+	sm_sendprop_info_t info;
+	if (!g_pGameHelpers->FindSendPropInfo(m_Sc->GetName(), name, &info))
 	{
 		return -1;
 	}
 
-	offset = prop->GetOffset();
+	offset = info.actual_offset;
 	if (size)
 	{
-		*size = prop->m_nBits;
+		*size = info.prop->m_nBits;
 	}
 
 	return offset;

extensions/sdktools/vnatives.cpp

@@ -778,7 +778,15 @@ static cell_t FindEntityByClassname(IPluginContext *pContext, const cell_t *para
 			if (!bProbablyNoFEBC)
 			{
 				bProbablyNoFEBC = true;
-				g_pSM->LogError(myself, "%s, falling back to IServerTools method.", error);
+
+				// CreateBaseCall above abstracts all of the gamedata logic, but we need to know if the key was even found.
+				// We don't want to log an error if key isn't present (knowing falling back to native method), only throw
+				// error if signature/symbol was not found.
+				void *dummy;
+				if (g_pGameConf->GetMemSig("FindEntityByClassname", &dummy))
+				{
+					g_pSM->LogError(myself, "%s, falling back to IServerTools method.", error);
+				}
 			}
 			return NativeFindEntityByClassname(pContext, params);
 #else
@@ -1252,6 +1260,34 @@ static cell_t GetPlayerResourceEntity(IPluginContext *pContext, const cell_t *pa
 	return -1;
 }
 
+static cell_t GivePlayerAmmo(IPluginContext *pContext, const cell_t *params)
+{
+	static ValveCall *pCall = NULL;
+	if (!pCall)
+	{
+		ValvePassInfo pass[3];
+		InitPass(pass[0], Valve_POD, PassType_Basic, PASSFLAG_BYVAL);
+		InitPass(pass[1], Valve_POD, PassType_Basic, PASSFLAG_BYVAL);
+		InitPass(pass[2], Valve_Bool, PassType_Basic, PASSFLAG_BYVAL);
+		if (!CreateBaseCall("GiveAmmo", ValveCall_Player, &pass[0], pass, 3, &pCall))
+		{
+			return pContext->ThrowNativeError("\"GiveAmmo\" not supported by this mod");
+		} else if (!pCall) {
+			return pContext->ThrowNativeError("\"GiveAmmo\" wrapper failed to initialize");
+		}
+	}
+
+	int ammoGiven;
+	START_CALL();
+	DECODE_VALVE_PARAM(1, thisinfo, 0);
+	DECODE_VALVE_PARAM(2, vparams, 0);
+	DECODE_VALVE_PARAM(3, vparams, 1);
+	DECODE_VALVE_PARAM(4, vparams, 2);
+	FINISH_CALL_SIMPLE(&ammoGiven);
+
+	return ammoGiven;
+}
+
 sp_nativeinfo_t g_Natives[] = 
 {
 	{"ExtinguishEntity",		ExtinguishEntity},
@@ -1280,5 +1316,6 @@ sp_nativeinfo_t g_Natives[] =
 	{"ActivateEntity",			ActivateEntity},
 	{"SetClientInfo",			SetClientInfo},
 	{"GetPlayerResourceEntity", GetPlayerResourceEntity},
+	{"GivePlayerAmmo",		GivePlayerAmmo},
 	{NULL,						NULL},
 };

extensions/sqlite/AMBuilder

@@ -1,22 +1,28 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/sqlite')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+binary = SM.ExtLibrary(builder, 'dbi.sqlite.ext')
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+]
 
-compiler['CDEFINES'].extend(['SQLITE_OMIT_LOAD_EXTENSION', 'SQLITE_THREADSAFE'])
-if AMBuild.target['platform'] == 'linux':
-	compiler['POSTLINKFLAGS'].extend(['-ldl', '-lpthread'])
+binary.compiler.defines += [
+  'SQLITE_OMIT_LOAD_EXTENSION',
+  'SQLITE_THREADSAFE'
+]
+if builder.target_platform == 'linux':
+  binary.compiler.postlink += ['-ldl', '-lpthread']
 
-extension = AMBuild.AddJob('dbi.sqlite.ext')
-binary = Cpp.LibraryBuilder('dbi.sqlite.ext', AMBuild, extension, compiler)
-files = [
-	'sdk/smsdk_ext.cpp', 'sdk/sm_memtable.cpp', 'extension.cpp',
-	'driver/SqDatabase.cpp', 'driver/SqDriver.cpp', 'driver/SqQuery.cpp',
-	'driver/SqResults.cpp', 'sqlite-source/sqlite3.c'
-	]
-binary.AddSourceFiles('extensions/sqlite', files)
-SM.AutoVersion('extensions/sqlite', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary.sources += [
+  'sdk/smsdk_ext.cpp',
+  'sdk/sm_memtable.cpp',
+  'extension.cpp',
+  'driver/SqDatabase.cpp',
+  'driver/SqDriver.cpp',
+  'driver/SqQuery.cpp',
+  'driver/SqResults.cpp',
+  'sqlite-source/sqlite3.c'
+]
+
+SM.extensions += [builder.Add(binary)]
 

extensions/sqlite/driver/SqDatabase.cpp

@@ -254,3 +254,9 @@ sqlite3 *SqDatabase::GetDb()
 {
 	return m_sq3;
 }
+
+bool SqDatabase::SetCharacterSet(const char *characterset)
+{
+	// sqlite only supports utf8 and utf16 - by the time the database is created. It's too late here.
+	return false;
+}

extensions/sqlite/driver/SqDatabase.h

@@ -58,6 +58,7 @@ public:
 	IQuery *DoQueryEx(const char *query, size_t len);
 	unsigned int GetAffectedRowsForQuery(IQuery *query);
 	unsigned int GetInsertIDForQuery(IQuery *query);
+	bool SetCharacterSet(const char *characterset);
 public:
 	sqlite3 *GetDb();
 private:

extensions/sqlite/extension.cpp

@@ -74,11 +74,11 @@ size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...)
 
 const char *SqliteExt::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *SqliteExt::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

extensions/tf2/AMBuilder

@@ -1,31 +1,22 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-sdk = SM.sdkInfo['tf2']
-compiler = SM.DefaultHL2Compiler('extensions/tf2', 'tf2')
-if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang':
-	compiler['CFLAGS'].append('-Wno-parentheses')
-
-name = 'game.tf2.ext.' + sdk['ext']
-extension = AMBuild.AddJob(name)
-binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-SM.PreSetupHL2Job(extension, binary, 'tf2')
-binary.AddSourceFiles('extensions/tf2', [
-	'extension.cpp',
-	'natives.cpp',
-	'RegNatives.cpp',
-	'util.cpp',
-	'criticals.cpp',
-	'holiday.cpp',
-	'teleporter.cpp',
-	'gameplayrules.cpp',
-	'conditions.cpp',
-	'CDetour/detours.cpp',
-	'sdk/smsdk_ext.cpp',
-	'asm/asm.c'
-	])
-SM.PostSetupHL2Job(extension, binary, 'tf2')
-SM.AutoVersion('extensions/tf2', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
-
+if 'tf2' in SM.sdks:
+  sdk = SM.sdks['tf2']
+  
+  binary = SM.HL2Library(builder, 'game.tf2.ext.' + sdk.ext, sdk)
+  binary.sources += [
+		'extension.cpp',
+		'natives.cpp',
+		'RegNatives.cpp',
+		'util.cpp',
+		'criticals.cpp',
+		'holiday.cpp',
+		'teleporter.cpp',
+		'gameplayrules.cpp',
+		'conditions.cpp',
+		'CDetour/detours.cpp',
+		'sdk/smsdk_ext.cpp',
+		'asm/asm.c'
+  ]
+  SM.extensions += [builder.Add(binary)]

extensions/tf2/conditions.cpp

@@ -35,7 +35,11 @@
 
 #include <iplayerinfo.h>
 
-typedef uint64_t condflags_t;
+typedef struct condflags_s {
+	uint64_t upper;
+	uint64_t lower;
+} condflags_t;
+condflags_t condflags_empty = { 0, 0 };
 
 condflags_t g_PlayerConds[MAXPLAYERS+1];
 
@@ -44,6 +48,7 @@ IForward *g_removeCondForward = NULL;
 
 int playerCondOffset = -1;
 int playerCondExOffset = -1;
+int playerCondEx2Offset = -1;
 int conditionBitsOffset = -1;
 
 bool g_bIgnoreRemove;
@@ -52,14 +57,18 @@ bool g_bIgnoreRemove;
 
 inline condflags_t GetPlayerConds(CBaseEntity *pPlayer)
 {
-	uint32_t playerCond   =  *(uint32_t *)((intptr_t)pPlayer + playerCondOffset);
-	uint32_t condBits     =  *(uint32_t *)((intptr_t)pPlayer + conditionBitsOffset);
-	uint32_t playerCondEx =  *(uint32_t *)((intptr_t)pPlayer + playerCondExOffset);
+	condflags_t result;
+	uint32_t playerCond    =  *(uint32_t *)((intptr_t)pPlayer + playerCondOffset);
+	uint32_t condBits      =  *(uint32_t *)((intptr_t)pPlayer + conditionBitsOffset);
+	uint32_t playerCondEx  =  *(uint32_t *)((intptr_t)pPlayer + playerCondExOffset);
+	uint32_t playerCondEx2 =  *(uint32_t *)((intptr_t)pPlayer + playerCondEx2Offset);
 
 	uint64_t playerCondExAdj = playerCondEx;
 	playerCondExAdj <<= 32;
 
-	return playerCond|condBits|playerCondExAdj;
+	result.lower = playerCond|condBits|playerCondExAdj;
+	result.upper = playerCondEx2;
+	return result;
 }
 
 void Conditions_OnGameFrame(bool simulating)
@@ -88,33 +97,49 @@ void Conditions_OnGameFrame(bool simulating)
 		oldconds = g_PlayerConds[i];
 		newconds = GetPlayerConds(pEntity);
 
-		if (oldconds == newconds)
+		if (oldconds.lower == newconds.lower && oldconds.upper == newconds.upper)
 			continue;
 
-		addedconds = newconds &~ oldconds;
-		removedconds = oldconds &~ newconds;
+		addedconds.lower = newconds.lower &~ oldconds.lower;
+		removedconds.lower = oldconds.lower &~ newconds.lower;
+		addedconds.upper = newconds.upper &~ oldconds.upper;
+		removedconds.upper = oldconds.upper &~ newconds.upper;
 
 		uint64_t j;
-		condflags_t bit;
+		uint64_t bit;
 
-		for (j = 0; j < MAX_CONDS && (bit = ((condflags_t)1 << j)) <= addedconds; j++)
+		uint64_t maxbit = MAX(addedconds.lower, addedconds.upper);
+		for (j = 0; j < MAX_CONDS && (bit = ((uint64_t)1 << j)) <= maxbit; j++)
 		{
-			if ((addedconds & bit) == bit)
+			if ((addedconds.lower & bit) == bit)
 			{
 				g_addCondForward->PushCell(i);
 				g_addCondForward->PushCell(j & 0xFFFFFFFF);
 				g_addCondForward->Execute(NULL, NULL);
 			}
+			if ((addedconds.upper & bit) == bit)
+			{
+				g_addCondForward->PushCell(i);
+				g_addCondForward->PushCell((j+64) & 0xFFFFFFFF);
+				g_addCondForward->Execute(NULL, NULL);
+			}
 		}
 
-		for (j = 0; j < MAX_CONDS && (bit = ((condflags_t)1 << j)) <= removedconds; j++)
+		maxbit = MAX(removedconds.lower, removedconds.upper);
+		for (j = 0; j < MAX_CONDS && (bit = ((uint64_t)1 << j)) <= maxbit; j++)
 		{
-			if ((removedconds & bit) == bit)
+			if ((removedconds.lower & bit) == bit)
 			{
 				g_removeCondForward->PushCell(i);
 				g_removeCondForward->PushCell(j & 0xFFFFFFFF);
 				g_removeCondForward->Execute(NULL, NULL);
 			}
+			if ((removedconds.upper & bit) == bit)
+			{
+				g_removeCondForward->PushCell(i);
+				g_removeCondForward->PushCell((j+64) & 0xFFFFFFFF);
+				g_removeCondForward->Execute(NULL, NULL);
+			}
 		}
 
 		g_PlayerConds[i] = newconds;
@@ -148,7 +173,15 @@ bool InitialiseConditionChecks()
 	
 	playerCondExOffset = prop.actual_offset;
 
-	if (playerCondOffset == -1 || playerCondExOffset == -1 || conditionBitsOffset == -1)
+	if (!gamehelpers->FindSendPropInfo("CTFPlayer", "m_nPlayerCondEx2", &prop))
+	{
+		g_pSM->LogError(myself, "Failed to find m_nPlayerCondEx2 prop offset");
+		return false;
+	}
+	
+	playerCondEx2Offset = prop.actual_offset;
+
+	if (playerCondOffset == -1 || playerCondExOffset == -1 || conditionBitsOffset == -1 || playerCondEx2Offset == -1)
 		return false;
 	
 	int maxClients = gpGlobals->maxClients;
@@ -168,7 +201,7 @@ bool InitialiseConditionChecks()
 
 void Conditions_OnClientPutInServer(int client)
 {
-	g_PlayerConds[client] = 0;
+	g_PlayerConds[client] = condflags_empty;
 }
 
 void RemoveConditionChecks()

extensions/tf2/criticals.cpp

@@ -87,8 +87,8 @@ bool CritManager::TryEnable()
 		if (!UTIL_ContainsDataTable(pNetworkable->GetServerClass()->m_pTable, TF_WEAPON_DATATABLE))
 			continue;
 
-		SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
-		SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
+		SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelper), false);
+		SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelperNoCrits), false);
 
 		m_entsHooked.Set(i);
 	}
@@ -104,8 +104,8 @@ void CritManager::Disable()
 	for (i; i != -1; i = m_entsHooked.FindNextSetBit(i))
 	{
 		CBaseEntity *pEntity = gamehelpers->ReferenceToEntity(i);
-		SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
-		SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
+		SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelper), false);
+		SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelperNoCrits), false);
 
 		m_entsHooked.Set(i, false);
 	}
@@ -126,8 +126,8 @@ void CritManager::OnEntityCreated(CBaseEntity *pEntity, const char *classname)
 	if (!UTIL_ContainsDataTable(pNetworkable->GetServerClass()->m_pTable, TF_WEAPON_DATATABLE))
 		return;
 
-	SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
-	SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
+	SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelper), false);
+	SH_ADD_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelperNoCrits), false);
 
 	m_entsHooked.Set(gamehelpers->EntityToBCompatRef(pEntity));
 }
@@ -144,13 +144,23 @@ void CritManager::OnEntityDestroyed(CBaseEntity *pEntity)
 	if (!m_entsHooked.IsBitSet(index))
 		return;
 
-	SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
-	SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelpers), false);
+	SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelper, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelper), false);
+	SH_REMOVE_MANUALHOOK(CalcIsAttackCriticalHelperNoCrits, pEntity, SH_MEMBER(&g_CritManager, &CritManager::Hook_CalcIsAttackCriticalHelperNoCrits), false);
 
 	m_entsHooked.Set(index, false);
 }
 
-bool CritManager::Hook_CalcIsAttackCriticalHelpers()
+bool CritManager::Hook_CalcIsAttackCriticalHelper()
+{
+	return Hook_CalcIsAttackCriticalHelpers(false);
+}
+
+bool CritManager::Hook_CalcIsAttackCriticalHelperNoCrits()
+{
+	return Hook_CalcIsAttackCriticalHelpers(true);
+}
+
+bool CritManager::Hook_CalcIsAttackCriticalHelpers(bool noCrits)
 {
 	CBaseEntity *pWeapon = META_IFACEPTR(CBaseEntity);
 	
@@ -171,7 +181,15 @@ bool CritManager::Hook_CalcIsAttackCriticalHelpers()
 		RETURN_META_VALUE(MRES_IGNORED, false);
 	}
 
-	int returnValue = 0;
+	int returnValue;
+	if (noCrits)
+	{
+		returnValue = SH_MCALL(pWeapon, CalcIsAttackCriticalHelperNoCrits)() ? 1 : 0;
+	}
+	else
+	{
+		returnValue = SH_MCALL(pWeapon, CalcIsAttackCriticalHelper)() ? 1 : 0;
+	}
 
 	int ownerIndex = -1;
 	CBaseHandle &hndl = *(CBaseHandle *) ((intptr_t)pWeapon + info.actual_offset);
@@ -191,9 +209,9 @@ bool CritManager::Hook_CalcIsAttackCriticalHelpers()
 
 	g_critForward->Execute(&result);
 
-	if (result && returnValue)
+	if (result > Pl_Continue)
 	{
-		RETURN_META_VALUE(MRES_SUPERCEDE, true);
+		RETURN_META_VALUE(MRES_SUPERCEDE, returnValue);
 	}
 	
 	RETURN_META_VALUE(MRES_IGNORED, false);

extensions/tf2/criticals.h

@@ -58,7 +58,10 @@ private:
 
 public:
 	// CritHook
-	bool Hook_CalcIsAttackCriticalHelpers();
+	bool Hook_CalcIsAttackCriticalHelper();
+	bool Hook_CalcIsAttackCriticalHelperNoCrits();
+private:
+	bool Hook_CalcIsAttackCriticalHelpers(bool noCrits);
 
 private:
 	bool m_enabled;

extensions/tf2/extension.cpp

@@ -136,12 +136,12 @@ bool TF2Tools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 const char *TF2Tools::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *TF2Tools::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 
 bool TF2Tools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)

extensions/topmenus/AMBuilder

@@ -1,20 +1,18 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/topmenus')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+binary = SM.ExtLibrary(builder, 'topmenus.ext')
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+]
 
-extension = AMBuild.AddJob('topmenus.ext')
-binary = Cpp.LibraryBuilder('topmenus.ext', AMBuild, extension, compiler)
-binary.AddSourceFiles('extensions/topmenus', [
-	'extension.cpp',
-	'smn_topmenus.cpp',
-	'TopMenu.cpp',
-	'TopMenuManager.cpp',
-	'sdk/smsdk_ext.cpp',
-	'sdk/sm_memtable.cpp'
-	])
-SM.AutoVersion('extensions/topmenus', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary.sources += [
+  'extension.cpp',
+  'smn_topmenus.cpp',
+  'TopMenu.cpp',
+  'TopMenuManager.cpp',
+  'sdk/smsdk_ext.cpp',
+  'sdk/sm_memtable.cpp'
+]
 
+SM.extensions += [builder.Add(binary)]

extensions/topmenus/extension.cpp

@@ -67,11 +67,11 @@ void TopMenuExtension::SDK_OnUnload()
 
 const char *TopMenuExtension::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *TopMenuExtension::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

extensions/updater/AMBuilder

@@ -1,19 +1,18 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/updater')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+binary = SM.ExtLibrary(builder, 'updater.ext')
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+]
 
-extension = AMBuild.AddJob('updater.ext')
-binary = Cpp.LibraryBuilder('updater.ext', AMBuild, extension, compiler)
-binary.AddSourceFiles('extensions/updater', [
-	'extension.cpp',
-	'MemoryDownloader.cpp',
-	'Updater.cpp',
-	'md5.cpp',
-	'sdk/smsdk_ext.cpp'
-	])
-SM.AutoVersion('extensions/updater', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary.sources += [
+  'extension.cpp',
+  'MemoryDownloader.cpp',
+  'Updater.cpp',
+  'md5.cpp',
+  'sdk/smsdk_ext.cpp'
+]
+
+SM.extensions += [builder.Add(binary)]
 

extensions/updater/Updater.cpp

@@ -356,7 +356,7 @@ void UpdateReader::PerformUpdate(const char *url)
 	xfer = webternet->CreateSession();
 	xfer->SetFailOnHTTPError(true);
 
-	form->AddString("version", SM_VERSION_STRING);
+	form->AddString("version", SOURCEMOD_VERSION);
 
 	unsigned int num_files = 0;
 	add_folders(form, "gamedata", num_files);

extensions/updater/extension.cpp

@@ -249,11 +249,11 @@ void AddUpdateError(const char *fmt, ...)
 
 const char *SmUpdater::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *SmUpdater::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }
 

gamedata/core.games/engine.csgo.txt

@@ -19,17 +19,22 @@
 			"game"		"csgo"
 		}
 		
+		"Addresses"
+		{
+			"EntInfosPtr"
+			{
+				"windows"
+				{
+					"signature"	"EntInfosFinder"
+					"read"	"19"
+				}
+			}
+		}
+		
 		"Offsets"
 		{
-			/* Offset into LevelShutdown */
-			"gEntList"
-			{
-				"windows"	"11"
-			}
-
 			"EntInfo"
 			{
-				"windows"	"4"
 				"linux"		"4"
 				"mac"		"4"
 			}
@@ -37,10 +42,11 @@
 		
 		"Signatures"
 		{
-			"LevelShutdown"
+			// This is not unique, but all matches have what we need. Found from FindEntityByClassname.
+			"EntInfosFinder"
 			{
 				"library"	"server"
-				"windows"	"\xE8\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\xE8"
+				"windows"	"\xEB\x15\x0F\xB7\xC0\x8D\x34\x40\x8B\x34\x2A\x2A\x2A\x2A\x2A\xEB\x06\x8B\x35"
 			}
 			
 			"gEntList"

gamedata/sdkhooks.games/engine.csgo.txt

@@ -35,22 +35,22 @@
 				"mac"		"68"
 			}
 			"PreThink"
-			{
-				"windows"	"362"
-				"linux"		"363"
-				"mac"		"363"
-			}
-			"PostThink"
 			{
 				"windows"	"363"
 				"linux"		"364"
 				"mac"		"364"
 			}
+			"PostThink"
+			{
+				"windows"	"364"
+				"linux"		"365"
+				"mac"		"365"
+			}
 			"Reload"
 			{
-				"windows"	"309"
-				"linux"		"310"
-				"mac"		"310"
+				"windows"	"307"
+				"linux"		"313"
+				"mac"		"313"
 			}
 			"SetTransmit"
 			{
@@ -136,29 +136,6 @@
 				"linux"		"283"
 				"mac"		"283"
 			}
-			
-			
-			// no longer used
-			"UpdateOnRemove"
-			{
-				"windows"	"109"
-				"linux"		"110"
-				"mac"		"110"
-			}
-			//
-		}
-		
-		"Signatures"
-		{
-			// no longer used
-			"IEntityFactoryDictionary"
-			{
-				"library"	"server"
-				"windows"	"\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
-				"linux"		"@_Z23EntityFactoryDictionaryv"
-				"mac"		"@_Z23EntityFactoryDictionaryv"
-			}
-			//
 		}
 	}
 	
@@ -168,10 +145,31 @@
 		{
 			"EntityListeners"
 			{
-				"windows"	"196644"
 				"linux"		"196644"
 				"mac"		"196644"
 			}
 		}
+		
+		"Addresses"
+		{
+			"EntityListenersPtr"
+			{
+				"windows"
+				{
+					"signature"	"EntityListenersFinder"
+					"read"		"18"
+				}
+			}
+		}
+		
+		"Signatures"
+		{
+			// Find call to AddListenerEntity in CPhysSaveRestoreBlockHandler::PreRestore (virtual)
+			"EntityListenersFinder"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x8B\x0D\x2A\x2A\x2A\x2A\x33\xC0\x56\x85\xC9\x7E\x32\x8B"
+			}
+		}
 	}
 }

gamedata/sdkhooks.games/game.alienswarm.txt

@@ -99,4 +99,15 @@
 			}
 		}
 	}
+	
+	"swarm"
+	{
+		"Offsets"
+		{
+			"EntityListeners"
+			{
+				"windows"		"131108"
+			}
+		}
+	}
 }

gamedata/sdkhooks.games/game.cstrike.txt

@@ -24,7 +24,7 @@
 			}
 			"GroundEntChanged"
 			{
-				"windows"	"178"
+				"windows"	"177"
 				"linux"		"179"
 				"mac"		"179"
 			}

gamedata/sdkhooks.games/game.gesource.txt

@@ -12,6 +12,7 @@
 
 "Games"
 {
+	/* GoldenEye: Source 4.2.4 */
 	"gesource"
 	{
 		"Offsets"
@@ -28,7 +29,7 @@
 			}
 			"GroundEntChanged"
 			{
-				"windows"	"167"
+				"windows"	"168"
 				"linux"		"168"
 			}
 			"OnTakeDamage"
@@ -46,6 +47,11 @@
 				"windows"	"292"
 				"linux"		"293"
 			}
+			"Reload"
+			{
+				"windows"	"251"
+				"linux"		"252"
+			}
 			"SetTransmit"
 			{
 				"windows"	"19"
@@ -81,11 +87,6 @@
 				"windows"	"58"
 				"linux"		"59"
 			}
-			"UpdateOnRemove"
-			{
-				"windows"	"97"
-				"linux"		"98"
-			}
 			"Use"
 			{
 				"windows"	"89"
@@ -121,16 +122,26 @@
 				"windows"	"235"
 				"linux"		"236"
 			}
+
+			// no longer used
+			"UpdateOnRemove"
+			{
+				"windows"	"97"
+				"linux"		"98"
+			}
+			//
 		}
 
 		"Signatures"
 		{
+			// no longer used
 			"IEntityFactoryDictionary"
 			{
 				"library"	"server"
-				"windows"	"\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
+				"windows"	"\xA1\x2A\x2A\x2A\x2A\xA8\x01\x75\x2A\x83\xC8\x01\xB9\x2A\x2A\x2A\x2A\xA3\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
 				"linux"		"@_Z23EntityFactoryDictionaryv"
 			}
+			//
 		}
 	}
 }

gamedata/sdktools.games/engine.csgo.txt

@@ -28,10 +28,10 @@
 	{
 		"Offsets"
 		{
-			/* Offset into CBaseTempEntity constructor */
+			/* Offset into CBaseTempEntity signature address */
 			"s_pTempEntities"
 			{
-				"windows"	"19"
+				"windows"	"4"
 			}
 			"GetTEName"
 			{
@@ -58,7 +58,7 @@
 			"CBaseTempEntity"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x4D\x08\xC7\x00\x2A\x2A\x2A\x2A\x89\x48\x2A\x8B"
+				"windows"	"\x89\x41\x04\xA1\x2A\x2A\x2A\x2A\x89\x41\x08\x89\x0D\x2A\x2A\x2A\x2A\xC7"
 			}
 			"s_pTempEntities"
 			{
@@ -78,7 +78,7 @@
 			"FindEntityByClassname"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x4D\x08\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x83\xF8\xFF\x75\x2A\xB8\xFF\x1F\x00\x00\x8D\x04\x40\x8B\x74\xC6\x2A\xEB"
+				// Fallback to IServerTools method instead on Windows, lest we add custom logic since it's no longer a thiscall on Windows in CS:GO
 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 				"mac"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
@@ -115,7 +115,7 @@
 			"CreateGameRulesObject"
 			{
 				"library"	"server"
-				"windows"	"\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\x6A\x01\xFF\xD2"
+				"windows"	"\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x6A\x01\xFF\x50"
 			}
 			"g_pGameRules"
 			{
@@ -139,7 +139,7 @@
 			 * the expected code. A pointer to sv (IServer interface) is used
 			 * here.
 			 */
-			"CreateFakeClient_Windows"	"\x55\x8B\xEC\x8B\x2A\x2A\x50\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x85\xC0\x75"
+			"CreateFakeClient_Windows"	"\x55\x8B\xEC\xFF\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x85"
 		}
 		
 		"Offsets"
@@ -147,7 +147,7 @@
 			/* Offset into IVEngineServer::CreateFakeClient */
 			"sv"
 			{
-				"windows"	"8"
+				"windows"	"7"
 			}
 		}
 		
@@ -171,10 +171,23 @@
 			"EntityFactory"
 			{
 				"library"	"server"
-				"windows"	"\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
 				"linux"		"@_Z23EntityFactoryDictionaryv"
 				"mac"		"@_Z23EntityFactoryDictionaryv"
 			}
+			
+			"EntityFactoryFinder"
+			{
+				"library"	"server"
+				"windows"	"\xFF\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x8B\xC8\xC7"
+			}
+		}
+		
+		"Offsets"
+		{
+			"EntityFactoryOffset"
+			{
+				"windows" 	"4"
+			}
 		}
 	}
 
@@ -186,7 +199,7 @@
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x57"
+				"windows"	"\x55\x8B\xEC\x83\x2A\x2A\x81\xEC\x2A\x2A\x2A\x2A\x8B\xC1\x53\x56\x57\x8B\x2A\x2A\x89\x2A\x2A\x2A\x33"
 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
@@ -207,7 +220,7 @@
 			"SetUserCvar"
 			{
 				/* Not 100% sure on this, why would windows change and not linux - TEST ME */
-				"windows"	"17"
+				"windows"	"27"
 				"linux"		"64"
 				"mac"		"64"
 			}
@@ -221,9 +234,9 @@
 			 */
 			"InfoChanged"
 			{
-				"windows"	"168"
-				"linux"		"168"
-				"mac"		"168"
+				"windows"	"412"
+				"linux"		"412"
+				"mac"		"412"
 			}
 		}
 	}
@@ -239,15 +252,15 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"442"
-				"linux"		"443"
-				"mac"		"443"
+				"windows"	"443"
+				"linux"		"444"
+				"mac"		"444"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"288"
-				"linux"		"289"
-				"mac"		"289"
+				"windows"	"289"
+				"linux"		"290"
+				"mac"		"290"
 			}
 			"Weapon_GetSlot"
 			{
@@ -275,9 +288,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"492"
-				"linux"		"492"
-				"mac"		"492"
+				"windows"	"493"
+				"linux"		"493"
+				"mac"		"493"
 			}
 			"GetVelocity"
 			{
@@ -317,9 +330,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"462"
-				"linux"		"463"
-				"mac"		"463"
+				"windows"	"463"
+				"linux"		"464"
+				"mac"		"464"
+			}
+			"GiveAmmo"
+			{
+				"windows"	"272"
+				"linux"		"273"
+				"mac"		"273"
 			}
 		}
 	}

gamedata/sdktools.games/game.cstrike.txt

@@ -110,6 +110,12 @@
 				"linux"		"419"
 				"mac"		"419"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"251"
+				"linux"		"252"
+				"mac"		"252"
+			}
 		}
 	}
 }

gamedata/sdktools.games/game.dod.txt

@@ -100,6 +100,12 @@
 				"linux"		"418"
 				"mac"		"418"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"251"
+				"linux"		"252"
+				"mac"		"252"
+			}
 		}
 		
 		"Keys"

gamedata/sdktools.games/game.gesource.txt

@@ -1,5 +1,6 @@
 "Games"
 {
+	/* GoldenEye: Source 4.2.4 */
 	"gesource"
 	{
 		"Offsets"
@@ -76,7 +77,12 @@
 			}
 			"s_pTempEntities"
 			{
-				"windows"	"19"
+				"windows"	"16"
+			}
+			"GiveAmmo"
+			{
+				"windows"	"226"
+				"linux"		"227"
 			}
 		}
 		"Signatures"
@@ -84,18 +90,18 @@
 			"CBaseTempEntity"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89"
+				"windows"	"\x55\x8B\xEC\x8B\x2A\x2A\x89\x41\x04\xC7\x2A\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x89\x41\x2A\x89"
 			}
 			"FindEntityByClassname"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5D\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x2A\x2A\x2A\x2A\x83\xC4\x2A\xEB\x2A\x39"
+				"windows"	"\x55\x8B\xEC\x53\x56\x57\x8B\xF9\x8B\x4D\x08\x85\xC9\x74\x2A\x8B\x01\xFF\x50\x08\x8B\x30\x81\xE6\xFF\x0F\x00\x00\x46\x03\xF6\x8B\x34\xF7\xEB\x2A\x8B\xB7\x04\x00\x01\x00\x85\xF6\x74\x2A\x8B\x5D\x0C\x8B\x3E\x85\xFF\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x15\x2A\x2A\x2A\x2A\x83\xC4\x04\xEB\x2A\x39\x5F\x5C"
 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x57\x89\x2A\x2A\xC7"
+				"windows"	"\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x8B\xC1\x56\x57\x8B"
 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
 		}

gamedata/sdktools.games/game.hidden.txt

@@ -102,6 +102,11 @@
 				"windows"	"364"
 				"linux"		"365"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"194"
+				"linux"		"195"
+			}
 		}
 		
 		"Signatures"

gamedata/sdktools.games/game.hl2mp.txt

@@ -100,6 +100,12 @@
 				"linux"		"418"
 				"mac"		"418"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"251"
+				"linux"		"252"
+				"mac"		"252"
+			}
 		}
 	}
 }

gamedata/sdktools.games/game.left4dead2.txt

@@ -204,6 +204,12 @@
 				"linux"		"454"
 				"mac"		"454"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"273"
+				"linux"		"274"
+				"mac"		"274"
+			}
 		}
 		
 		"Keys"

gamedata/sdktools.games/game.nmrih.txt

@@ -86,6 +86,12 @@
 				"windows"	"382"
 				"linux"		"383"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"253"
+				"linux"		"253"
+				"mac"		"253"
+			}
 			
 			/* Offset into CBaseTempEntity constructor (vs2010 moved it!) */
 			"s_pTempEntities"

gamedata/sdktools.games/game.tf.txt

@@ -100,6 +100,12 @@
 				"linux"		"418"
 				"mac"		"418"
 			}
+			"GiveAmmo"
+			{
+				"windows"	"251"
+				"linux"		"252"
+				"mac"		"252"
+			}
 		}
 		
 		"Keys"

gamedata/sm-cstrike.games/game.csgo.txt

@@ -32,7 +32,7 @@
 			//Offset into CheckRestartRound
 			"CTTeamScoreOffset"
 			{
-				"windows"	"97"
+				"windows"	"98"
 				"linux"		"124"
 				"mac"		"150"
 			}
@@ -45,59 +45,72 @@
 			}
 			"ClanTagOffset"
 			{
-				"windows"	"15"
+				"windows"	"12"
 				"linux"		"41"
 				"mac"		"22"
 			}
+			//Offset into HandleCommand_Buy_Internal
+			"CCSPlayerInventoryOffset"
+			{
+				"windows"	"285"
+				"linux"		"87"
+				"mac"		"109"
+			}
+			"GetItemInLoadout"
+			{
+				"windows"	"8"
+				"linux"		"9"
+				"mac"		"9"
+			}
 		}
 		"Signatures"
 		{
 			"RoundRespawn"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x56\x8B\xF1\x8B\x0D\x2A\x2A\x2A\x2A\x57\xE8\x2A\x2A\x2A\x2A\x84\xC0\x0F"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x56\x8B\xF1\x8B\x0D\x2A\x2A\x2A\x2A\x57\x8B\x01\xFF\x50\x2A\x83"
 				"linux"		"@_ZN9CCSPlayer12RoundRespawnEv"
 				"mac"		"@_ZN9CCSPlayer12RoundRespawnEv"
 			}
 			"SwitchTeam"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x56\x57\x8B\x7D\x2A\x57\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x83\xC4"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x0C\x56\x8B\x75\x2A\x57\x8B\xF9\x85\xF6\x0F\x88\x2A\x2A\x2A\x2A\x3B\x35\x2A\x2A\x2A\x2A\x0F\x8D\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x83"
 				"linux"		"@_ZN9CCSPlayer10SwitchTeamEi"
 				"mac"		"@_ZN9CCSPlayer10SwitchTeamEi"
 			}
-			"HandleCommand_Buy_Internal"
+			"HandleCommand_Buy_Internal"//Wildcard first 6 bytes for getting address for weapon price.
 			{
 				"library"		"server"
-				"windows"		"\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x56\x57\x6A\x00\x8B\xF1\xE8"
+				"windows"		"\x2A\x2A\x2A\x2A\x2A\x2A\x81\xEC\x2A\x2A\x2A\x2A\x83\x3D\x2A\x2A\x2A\x2A\x00\x53\x56\x57\x8B\xF9"
 				"linux"			"@_ZN9CCSPlayer26HandleCommand_Buy_InternalEPKcib"
 				"mac"			"@_ZN9CCSPlayer26HandleCommand_Buy_InternalEPKcib"
 			}
 			"CSWeaponDrop"//Wildcard first 6 bytes for CS:S DM
 			{
 				"library"		"server"
-				"windows"		"\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x53\x56\x57\x8B\x7D\x2A\x6A\x00\x68"
+				"windows"		"\x2A\x2A\x2A\x2A\x2A\x2A\x81\xEC\x2A\x2A\x2A\x2A\x56\x8B\x75\x2A\x57\x6A\x00\x68"
 				"linux"			"@_ZN9CCSPlayer12CSWeaponDropEP17CBaseCombatWeaponbb"
 				"mac"			"@_ZN9CCSPlayer12CSWeaponDropEP17CBaseCombatWeaponbb"
 			}
 			"TerminateRound"
 			{
 				"library"		"server"
-				"windows"		"\x55\x8B\xEC\x83\xEC\x2A\x53\x8B\xD9\x8B\x2A\x2A\x2A\x2A\x2A\x56\x57\x33\xFF\x89"
+				"windows"		"\x55\x8B\xEC\x83\x2A\x2A\x83\x2A\x2A\x53\x56\x8B\xF1\xF3\x0F\x2A\x2A\x2A\x2A\x57\x33\xFF\x89\x2A\x2A\x2A\xC7\x2A\x2A\x2A\x00\x00\x00\x00"
 				"linux"			"@_ZN12CCSGameRules14TerminateRoundEfi"
 				"mac"			"@_ZN12CCSGameRules14TerminateRoundEfi"
 			}
 			"GetTranslatedWeaponAlias"
 			{
 				"library"		"server"
-				"windows"		"\x55\x8B\xEC\x56\x57\x8B\x2A\x2A\x33\xF6\x8D\x9B\x2A\x2A\x2A\x2A\x8B\x04\xF5\x2A\x2A\x2A\x2A\x57\x50\xE8\x2A\x2A\x2A\x2A\x83\xC4\x2A\x85\xC0\x74\x2A\x46\x83\xFE\x2A\x72\x2A\x8B\xC7\x5F\x5E\x5D\xC3"
+				"windows"		"\x55\x8B\xEC\x83\xEC\x08\x53\x33\xC0\x89\x4D\xF8\x56\x57\x89\x45\xFC\x33\xDB\x8B\xB3\x2A\x2A\x2A\x2A\x3B\xF1\x74\x2A\x8B\xF9\x90\x0F\xB6\x06\x0F\xB6\x17\x3B\xC2\x75\x2A\x85\xC0\x75\x2A\x8B\x45\xFC\x5F\x5E\x5B\x8B\x04\xC5\x2A\x2A\x2A\x2A\x8B\xE5\x5D\xC3\x85\xD2\x74\x2A\x8D\x48\xBF\x83\xF9\x19\x77\x2A\x83\xC0\x20\x8D\x4A\xBF\x83\xF9\x19\x77\x2A\x83\xC2\x20\x3B\xC2\x75\x2A\x0F\xB6\x46\x01\x83\xC6\x02\x0F\xB6\x57\x01\x83\xC7\x02\x3B\xC2\x75\x2A\x85\xC0\x75\x2A\x8B\x45\xFC\x5F\x5E\x5B\x8B\x04\xC5\x2A\x2A\x2A\x2A\x8B\xE5\x5D\xC3\x85\xD2\x74\x2A\x8D\x48\xBF\x83\xF9\x19\x77\x2A\x83\xC0\x20\x8D\x4A\xBF\x83\xF9\x19\x77\x2A\x83\xC2\x20\x3B\xC2\x0F\x84\x2A\x2A\x2A\x2A\x2B\xC2\x85\xC0\x74\x2A\xFF\x45\xFC\x83\xC3\x08\x8B\x4D\xF8\x81\xFB\xC0\x00\x00\x00\x0F\x82\x2A\x2A\x2A\x2A\x5F\x5E\x8B\xC1\x5B\x8B\xE5\x5D\xC3"
 				"linux"			"@_Z24GetTranslatedWeaponAliasPKc"
 				"mac"			"@_Z24GetTranslatedWeaponAliasPKc"
 			}
 			"GetWeaponInfo"
 			{
 				"library"		"server"
-				"windows"		"\x55\x8B\xEC\x8B\x4D\x2A\x33\xC0\x85\xC9\x74"
+				"windows"		"\x55\x8B\xEC\x83\xEC\x08\x33\xC0\xEB\x2A\x8D\x9B\x00\x00\x00\x00\x39\x0C\xC5\x2A\x2A\x2A\x2A\x74\x2A\x40\x83\xF8\x38\x72\x2A\x33\xC0"
 				"linux"			"@_Z13GetWeaponInfo10CSWeaponID"
 				"mac"			"@_Z13GetWeaponInfo10CSWeaponID"
 			}
@@ -105,28 +118,28 @@
 			"CheckWinLimit"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x81\xF9\x2A\x2A\x2A\x2A\x75\x2A\x8B"
+				"windows"	"\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x64\x53\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x81\xF9"
 				"linux"		"@_ZN12CCSGameRules17CheckRestartRoundEv"
 				"mac"		"@_ZN12CCSGameRules17CheckRestartRoundEv"
 			}
 			"AliasToWeaponID"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x57\x8B\x2A\x2A\x85\xFF\x75\x2A\x33\xC0\x5F\x5D\xC3\x56\x33\xF6\x8B\x04\xF5"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x57\x8B\xF9\x33\xC0"
 				"linux"		"@_Z15AliasToWeaponIDPKc"
 				"mac"		"@_Z15AliasToWeaponIDPKc"
 			}
 			"WeaponIDToAlias"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\x4D\x08\x33\xC0\xEB\x2A\x8D\x9B\x00\x00\x00\x00\x39\x0C\xC5\x2A\x2A\x2A\x2A\x74\x2A\x40\x83\xF8\x38\x72\x2A\x33\xC0\x5D\xC3\x8B\x04\xC5\x2A\x2A\x2A\x2A\x6A\x5F"
+				"windows"	"\x33\xC0\x39\x0C\xC5\x2A\x2A\x2A\x2A\x74\x2A\x40\x83\xF8\x38\x72\x2A\x33\xC0\xC3\x6A\x5F"
 				"linux"		"@_Z15WeaponIDToAliasi"
 				"mac"		"@_Z15WeaponIDToAliasi"
 			}
 			"SetClanTag"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\x2A\x2A\x85\xC0\x74\x2A\x6A\x10\x50\x81\xC1\x2A\x2A\x2A\x2A\x51"
+				"windows"	"\x55\x8B\xEC\x8B\x55\x08\x85\xD2\x74\x2A\x8D\x81\x1C\x20\x00\x00"
 				"linux"		"@_ZN9CCSPlayer10SetClanTagEPKc"
 				"mac"		"@_ZN9CCSPlayer10SetClanTagEPKc"
 			}
@@ -134,14 +147,14 @@
 			"GetAttributeInt"
 			{
 				"library"	"server"
-				"windows"	"\x2A\x2A\x2A\x2A\x2A\x2A\x08\x56\x57\x8B\xF1\x50\x8D\x4D\xFC\x51\xE8\x2A\x2A\x2A\x2A\x8B\x4D\x0C\x0F\x57\xC0\x8B\x7D\xFC\x83\xC4\x08\xF3\x0F\x11\x45\x08\x85\xC9\x74\x2A\x80\x2A\x2A\x00\x74\x2A\x57\x8D\x55\x08\x52\xE8\x2A\x2A\x2A\x2A\x84\xC0\x75\x2A\x57\x8B\xCE\xE8\x2A\x2A\x2A\x2A\x83\xF8\xFF\x74\x2A\x83\xF8\xFF\x7E\x2A\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x04\x81\x83\x2A\x2A\x05"
+				"windows"	"\x2A\x2A\x2A\x2A\x2A\x2A\x83\xEC\x1C\x53\x8B\x5D\x0C\xC7\x44\x24\x04\x00\x00\x00\x00\x56\x8B\xF1\x89\x74\x24\x0C\x57\x8B\x7D\x08\x85\xDB\x74\x2A\x80\x7B\x44\x00\x74\x2A\x57\xE8\x2A\x2A\x2A\x2A\x8B\xC8\xE8\x2A\x2A\x2A\x2A\x89\x44\x24\x14\xE8\x2A\x2A\x2A\x2A\x8B\x70\x08\xE8\x2A\x2A\x2A\x2A\x3B\x70\x08\x74\x2A\x57\xE8\x2A\x2A\x2A\x2A\x8B\xC8\xE8\x2A\x2A\x2A\x2A\xEB\x2A\x8B\x44\x24\x14\x85\xC0\x74\x2A\x89\x44\x24\x1C\x8D\x4C\x24\x18\x8D\x44\x24\x0C\xC7\x44\x24\x18\x2A\x2A\x2A\x2A\x89\x44\x24\x20\x8B\x03\x51\x8B\xCB\xC6\x44\x24\x28\x00\xFF\x50\x2A\x80\x7C\x24\x24\x00\x74\x2A\x8B\x44\x24\x0C"
 				"linux"		"@_ZNK16FileWeaponInfo_t15GetAttributeIntEPKcPK13CEconItemView"
 				"mac"		"@_ZNK16FileWeaponInfo_t15GetAttributeIntEPKcPK13CEconItemView"
 			}
 			"SetModelFromClass"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x51\x53\x56\x8B\xF1\x57\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x8B\xD8"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x56\x57\x8B\xF9\xC7\x45\xFC\x2A\x2A\x2A\x2A\x8B\x87"
 				"linux"		"@_ZN9CCSPlayer17SetModelFromClassEv"
 				"mac"		"@_ZN9CCSPlayer17SetModelFromClassEv"
 			}

loader/AMBuilder

@@ -1,22 +1,22 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-compiler = SM.DefaultCompiler()
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core'))
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+if builder.target_platform in ['windows', 'mac']:
+  name = 'sourcemod_mm'
+  extra_ldflags = []
+elif builder.target_platform == 'linux':
+  name = 'sourcemod_mm_i486'
+  extra_ldflags = ['-ldl']
 
-if AMBuild.target['platform'] == 'windows' or AMBuild.target['platform'] == 'darwin':
-	name = 'sourcemod_mm'
-elif AMBuild.target['platform'] == 'linux':
-	name = 'sourcemod_mm_i486'
-	compiler['POSTLINKFLAGS'].extend(['-ldl'])
-
-loader = AMBuild.AddJob('loader')
-binary = Cpp.LibraryBuilder(name, AMBuild, loader, compiler)
-binary.AddSourceFiles('loader', [
-	'loader.cpp'
-	])
-SM.AutoVersion('loader', binary)
-SM.ExtractDebugInfo(loader, binary)
-binary.SendToJob()
+binary = SM.Library(builder, name)
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core'),
+  os.path.join(SM.mms_root, 'sourcehook')
+]
+binary.compiler.linkflags += extra_ldflags
+binary.sources = [
+  'loader.cpp'
+]
 
+nodes = builder.Add(binary)
+SM.binaries += [nodes]

plugins/AMBuilder

@@ -1,53 +1,65 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python: 
 import os
-import os.path
-import ambuild.osutil as osutil
-import ambuild.command as command
 
 files = [
-	'adminhelp.sp',
-	'antiflood.sp',
-	'basecomm.sp',
-	'clientprefs.sp',
-	'nextmap.sp',
-	'reservedslots.sp',
-	'adminmenu.sp',
-	'basebans.sp',
-	'basetriggers.sp',
-	'funcommands.sp',
-	'nominations.sp',
-	'rockthevote.sp',
-	'admin-sql-prefetch.sp',
-	'basechat.sp',
-	'basevotes.sp',
-	'funvotes.sp',
-	'playercommands.sp',
-	'sounds.sp',
-	'admin-sql-threaded.sp',
-	'basecommands.sp',
-	'mapchooser.sp',
-	'randomcycle.sp',
-	'sql-admin-manager.sp'
-	]
+  'adminhelp.sp',
+  'antiflood.sp',
+  'basecomm.sp',
+  'clientprefs.sp',
+  'nextmap.sp',
+  'reservedslots.sp',
+  'adminmenu.sp',
+  'basebans.sp',
+  'basetriggers.sp',
+  'funcommands.sp',
+  'nominations.sp',
+  'rockthevote.sp',
+  'admin-sql-prefetch.sp',
+  'basechat.sp',
+  'basevotes.sp',
+  'funvotes.sp',
+  'playercommands.sp',
+  'sounds.sp',
+  'admin-sql-threaded.sp',
+  'basecommands.sp',
+  'mapchooser.sp',
+  'randomcycle.sp',
+  'sql-admin-manager.sp'
+]
 
-plugins = AMBuild.AddJob('plugins')
+spcomp_argv = [
+  os.path.join(builder.buildPath, SM.spcomp.binary.path),
+  'SM_GENERATED_BUILD=',
+  '-i' + os.path.relpath(os.path.join(builder.buildPath, 'includes'),
+                         os.path.join(builder.buildPath, builder.buildFolder)),
+  '-i' + os.path.relpath(os.path.join(builder.sourcePath, 'plugins', 'include'),
+                         os.path.join(builder.buildPath, builder.buildFolder)),
+  '-h',
+]
 
-spcomp = os.path.join(AMBuild.outputFolder, 'spcomp', 'spcomp')
-includes = os.path.relpath(os.path.join(AMBuild.sourceFolder, 'plugins', 'include'),
-                           os.path.join(AMBuild.outputFolder, 'plugins'))
-
-versioninc = os.path.relpath(os.path.join(AMBuild.outputFolder, 'includes'),
-                             os.path.join(AMBuild.outputFolder, 'plugins'))
-
-#This one has to be special
-sp = os.path.join(AMBuild.sourceFolder, 'plugins', 'admin-flatfile', 'admin-flatfile.sp')
-args = [spcomp, 'SM_GENERATED_BUILD=', '-i' + versioninc, '-i' + includes, sp]
-plugins.AddCommand(command.DirectCommand(args))
-
-#Do the normal ones
-for file in files:
-	sp = os.path.join(AMBuild.sourceFolder, 'plugins', file)
-	args = [spcomp, 'SM_GENERATED_BUILD=', '-i' + versioninc, '-i' + includes, sp]
-	plugins.AddCommand(command.DirectCommand(args))
+def build_plugin(script_path, smx_file):
+  inputs = [
+    SM.spcomp.binary,
+    script_path,
+  ]
+  outputs = [
+    smx_file
+  ]
+  argv = spcomp_argv + [script_path]
+  cmd_entry, (smx_entry,) = builder.AddCommand(
+    inputs = inputs,
+    argv = argv,
+    outputs = outputs,
+    dep_type = 'msvc',
+    weak_inputs = SM.generated_headers
+  )
+  SM.smx_files[smx_file] = smx_entry
 
+for script_file in files:
+  script_path = os.path.join(builder.currentSourcePath, script_file)
+  smx_file = os.path.splitext(script_file)[0] + '.smx'
+  build_plugin(script_path, smx_file)
 
+# This one has to be special.
+build_plugin(os.path.join(builder.currentSourcePath, 'admin-flatfile', 'admin-flatfile.sp'),
+             'admin-flatfile.smx')

plugins/antiflood.sp

@@ -72,7 +72,7 @@ public bool:OnClientFloodCheck(client)
 		return false;
 	}
 	
-	if (g_LastTime[client] > GetGameTime())
+	if (g_LastTime[client] >= GetGameTime())
 	{
 		/* If player has 3 or more flood tokens, block their message */
 		if (g_FloodTokens[client] >= 3)
@@ -95,7 +95,7 @@ public OnClientFloodResult(client, bool:blocked)
 	new Float:curTime = GetGameTime();
 	new Float:newTime = curTime + max_chat;
 	
-	if (g_LastTime[client] > curTime)
+	if (g_LastTime[client] >= curTime)
 	{
 		/* If the last message was blocked, update their time limit */
 		if (blocked)

plugins/include/datapack.inc

@@ -50,7 +50,7 @@ native Handle:CreateDataPack();
  * @noreturn
  * @error			Invalid handle.
  */
-native WritePackCell(Handle:pack, cell);
+native WritePackCell(Handle:pack, any:cell);
 
 /**
  * Packs a float into a data pack.
@@ -79,7 +79,7 @@ native WritePackString(Handle:pack, const String:str[]);
  * @return			Cell value.
  * @error			Invalid handle, or bounds error.
  */
-native ReadPackCell(Handle:pack);
+native any:ReadPackCell(Handle:pack);
 
 /**
  * Reads a float from a data pack.

plugins/include/dbi.inc

@@ -251,6 +251,18 @@ native SQL_GetDriverIdent(Handle:driver, String:ident[], maxlength);
  */
 native SQL_GetDriverProduct(Handle:driver, String:product[], maxlength);
 
+/**
+ * Sets the character set of the current connection. 
+ * Like SET NAMES .. in mysql, but stays after connection problems.
+ * 
+ * Example: "utf8", "latin1"
+ *
+ * @param database      Database Handle.
+ * @param characterset  The character set string to change to.
+ * @return              True, if character set was changed, false otherwise.
+ */
+native bool:SQL_SetCharset(Handle:database, const String:charset[]);
+
 /**
  * Returns the number of affected rows from the last query.
  *

plugins/include/halflife.inc

@@ -579,14 +579,17 @@ stock ShowMOTDPanel(client, const String:title[], const String:msg[], type=MOTDP
  *
  * @param client		Client index.
  * @param time			Duration to hold the panel on the client's screen.
- * @param ip			Destionation IP.
+ * @param ip			Destination IP.
+ * @param password		Password to connect to the destination IP. The client will be able to see this.
  * @noreturn
  */
-stock DisplayAskConnectBox(client, Float:time, const String:ip[])
+stock DisplayAskConnectBox(client, Float:time, const String:ip[], const String:password[] = "")
 {
+	decl String:destination[288];
+	FormatEx(destination, sizeof(destination), "%s/%s", ip, password);
 	new Handle:Kv = CreateKeyValues("data");
 	KvSetFloat(Kv, "time", time);
-	KvSetString(Kv, "title", ip);
+	KvSetString(Kv, "title", destination);
 	CreateDialog(client, Kv, DialogType_AskConnect);
 	CloseHandle(Kv);
 }

plugins/include/sdktools_functions.inc

@@ -320,3 +320,16 @@ native ActivateEntity(entity);
  * @error				Invalid client index, or client not connected.
  */
 native SetClientInfo(client, const String:key[], const String:value[]);
+
+/**
+ * Gives ammo of a certain type to a player.
+ * This natives obeys the maximum amount of ammo a player can carry per ammo type.
+ *
+ * @param client        The client index.
+ * @param amount        Amount of ammo to give. Is capped at ammotype's limit.
+ * @param ammotype      Type of ammo to give to player.
+ * @param suppressSound If true, don't play the ammo pickup sound.
+ *
+ * @return Amount of ammo actually given.
+ */
+native GivePlayerAmmo(client, amount, ammotype, bool:suppressSound=false);

plugins/include/sorting.inc

@@ -125,8 +125,8 @@ native SortCustom1D(array[], array_size, SortFunc1D:sortfunc, Handle:hndl=INVALI
  */
 funcenum SortFunc2D
 {
-	public(array[], array[], const array[][], Handle:hndl),
-	public(String:array[], String:array[], const String:array[][], Handle:hndl),
+	public(elem1[], elem2[], const array[][], Handle:hndl),
+	public(String:elem1[], String:elem2[], const String:array[][], Handle:hndl),
 };
 
 /** 

plugins/include/tf2.inc

@@ -107,18 +107,18 @@ enum TFCond
 	TFCond_RegenBuffed,
 	TFCond_MarkedForDeath,
 	TFCond_NoHealingDamageBuff,
-	TFCond_SpeedBuffAlly,
+	TFCond_SpeedBuffAlly,		//32
 	TFCond_HalloweenCritCandy,
 	TFCond_CritCanteen,
-	
-	TFCond_CritHype = 36,
+	TFCond_CritDemoCharge,
+	TFCond_CritHype,
 	TFCond_CritOnFirstBlood,
 	TFCond_CritOnWin,
 	TFCond_CritOnFlagCapture,
 	TFCond_CritOnKill,
 	TFCond_RestrictToMelee,
-	
-	TFCond_Reprogrammed = 43,
+	TFCond_DefenseBuffNoCritBlock,
+	TFCond_Reprogrammed,
 	TFCond_CritMmmph,
 	TFCond_DefenseBuffMmmph,
 	TFCond_FocusBuff,
@@ -140,18 +140,23 @@ enum TFCond
 	TFCond_SmallBlastResist,
 	TFCond_SmallFireResist,
 	TFCond_Stealthed, // 64
-
-	TFCond_StealthedUserBuffFade = 66,
-
-	TFCond_MVMBotRadiowave = 71,
+	TFCond_MedigunDebuff,
+	TFCond_StealthedUserBuffFade,
+	TFCond_BulletImmune,
+	TFCond_BlastImmune,
+	TFCond_FireImmune,
+	TFCond_PreventDeath,
+	TFCond_MVMBotRadiowave,
 	TFCond_HalloweenSpeedBoost,
 	TFCond_HalloweenQuickHeal,
 	TFCond_HalloweenGiant,
-	TFCond_HalloweenTiny, // 75
-
-	TFCond_HalloweenGhostMode = 77,
+	TFCond_HalloweenTiny,
+	TFCond_HalloweenInHell,
+	TFCond_HalloweenGhostMode,
 };
 
+const Float:TFCondDuration_Infinite = -1.0;
+
 enum TFHoliday
 {
 	TFHoliday_Birthday = 1,
@@ -214,11 +219,12 @@ native TF2_RegeneratePlayer(client);
  * @param client		Player's index.
  * @param condition		Integer identifier of condition to apply.
  * @param duration		Duration of condition (does not apply to all conditions).
+ *                      Pass TFCondDuration_Infinite to apply until manually removed.
  * @param inflictor		Condition inflictor's index (0 for no inflictor).
  * @noreturn
  * @error				Invalid client index, client not in game, or no mod support.
  */
-native TF2_AddCondition(client, TFCond:condition, Float:duration, inflictor=0);
+native TF2_AddCondition(client, TFCond:condition, Float:duration=TFCondDuration_Infinite, inflictor=0);
 
 /**
  * Removes a condition from a player

plugins/include/tf2_stocks.inc

@@ -143,6 +143,7 @@ enum {
 	TF_CUSTOM_MERASMUS_ZAP,
 	TF_CUSTOM_MERASMUS_DECAPITATION,
 	TF_CUSTOM_CANNONBALL_PUSH,
+	TF_CUSTOM_TAUNT_ALLCLASS_GUITAR_RIFF,
 };
 
 // Weapon codes as used in some events, such as player_death

plugins/include/topmenus.inc

@@ -178,11 +178,11 @@ native bool:LoadTopMenuConfig(Handle:topmenu, const String:file[], String:error[
  * @param name				Object name (MUST be unique).
  * @param type				Object type.
  * @param handler			Handler for object.
- * @param cmdname			Command name (for access overrides).
- * @param flags				Default access flags.
  * @param parent			Parent object ID, or INVALID_TOPMENUOBJECT for none.
  *							Items must have a category parent.
  *							Categories must not have a parent.
+ * @param cmdname			Command name (for access overrides).
+ * @param flags				Default access flags.
  * @param info_string		Arbitrary storage (max 255 bytes).
  * @return					A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on
  *							failure.

plugins/mapchooser.sp

@@ -99,7 +99,6 @@ new bool:g_ChangeMapAtRoundEnd;
 new bool:g_ChangeMapInProgress;
 new g_mapFileSerial = -1;
 
-new g_NominateCount = 0;
 new MapChange:g_ChangeTime;
 
 new Handle:g_NominationsResetForward = INVALID_HANDLE;
@@ -229,7 +228,6 @@ public OnConfigsExecuted()
 	
 	g_MapVoteCompleted = false;
 	
-	g_NominateCount = 0;
 	ClearArray(g_NominateList);
 	ClearArray(g_NominateOwners);
 	
@@ -287,7 +285,6 @@ public OnClientDisconnect(client)
 	
 	RemoveFromArray(g_NominateOwners, index);
 	RemoveFromArray(g_NominateList, index);
-	g_NominateCount--;
 }
 
 public Action:Command_SetNextmap(client, args)
@@ -980,6 +977,12 @@ NominateResult:InternalNominateMap(String:map[], bool:force, owner)
 		return Nominate_InvalidMap;
 	}
 	
+	/* Map already in the vote */
+	if (FindStringInArray(g_NominateList, map) != -1)
+	{
+		return Nominate_AlreadyInVote;	
+	}
+	
 	new index;
 
 	/* Look to replace an existing nomination by this client - Nominations made with owner = 0 aren't replaced */
@@ -997,21 +1000,13 @@ NominateResult:InternalNominateMap(String:map[], bool:force, owner)
 	}
 	
 	/* Too many nominated maps. */
-	if (g_NominateCount >= GetConVarInt(g_Cvar_IncludeMaps) && !force)
+	if (GetArraySize(g_NominateList) >= GetConVarInt(g_Cvar_IncludeMaps) && !force)
 	{
 		return Nominate_VoteFull;
 	}
 	
-	/* Map already in the vote */
-	if (FindStringInArray(g_NominateList, map) != -1)
-	{
-		return Nominate_AlreadyInVote;	
-	}
-	
-	
 	PushArrayString(g_NominateList, map);
 	PushArrayCell(g_NominateOwners, owner);
-	g_NominateCount++;
 	
 	while (GetArraySize(g_NominateList) > GetConVarInt(g_Cvar_IncludeMaps))
 	{
@@ -1064,7 +1059,6 @@ bool:InternalRemoveNominationByMap(String:map[])
 
 			RemoveFromArray(g_NominateList, i);
 			RemoveFromArray(g_NominateOwners, i);
-			g_NominateCount--;
 
 			return true;
 		}
@@ -1106,7 +1100,6 @@ bool:InternalRemoveNominationByOwner(owner)
 
 		RemoveFromArray(g_NominateList, index);
 		RemoveFromArray(g_NominateOwners, index);
-		g_NominateCount--;
 
 		return true;
 	}

product.version

@@ -1 +1 @@
-1.5.2
+1.5.3

public/IDBDriver.h

@@ -42,7 +42,7 @@
  */
 
 #define SMINTERFACE_DBI_NAME		"IDBI"
-#define SMINTERFACE_DBI_VERSION		8
+#define SMINTERFACE_DBI_VERSION		9
 
 namespace SourceMod
 {
@@ -600,6 +600,13 @@ namespace SourceMod
 		 *						if applicable.
 		 */
 		virtual unsigned int GetInsertIDForQuery(IQuery *query) =0;
+
+		/**
+		 * @brief Sets the character set of the current connection
+		 *
+		 * @param characterset  The characterset to switch to. e.g. "utf8".
+		 */
+		virtual bool SetCharacterSet(const char *characterset) =0;
 	};
 
 	/** 

public/sourcemod_version.h

@@ -39,21 +39,34 @@
  */
 
 #if defined SM_GENERATED_BUILD
-#include <sourcemod_version_auto.h>
+# if defined RC_COMPILE
+#  undef SM_USE_VERSIONLIB
+# endif
+# if defined SM_USE_VERSIONLIB
+#  include <versionlib.h>
+# else 
+#  include <sourcemod_version_auto.h>
+# endif
 #else
 #define SM_BUILD_TAG		"manual"
 #define SM_BUILD_REV		"0"
 #define SM_BUILD_CSET		"0"
 #define SM_BUILD_MAJOR		"1"
-#define SM_BUILD_MINOR		"5"
+#define SM_BUILD_MINOR		"6"
 #define SM_BUILD_RELEASE	"0"
 
 #define SM_BUILD_UNIQUEID SM_BUILD_REV ":" SM_BUILD_CSET
 
 #define SM_VERSION_STRING	SM_BUILD_MAJOR "." SM_BUILD_MINOR "." SM_BUILD_RELEASE "-" SM_BUILD_TAG
-#define SM_VERSION_FILE		1,5,0,0
+#define SM_VERSION_FILE		1,6,0,0
 #endif
 #define SM_BUILD_TIMESTAMP	__DATE__ " " __TIME__
 
+#if !defined(SM_GENERATED_BUILD) || !defined(SM_USE_VERSIONLIB)
+# define SOURCEMOD_VERSION 		SM_VERSION_STRING
+# define SOURCEMOD_BUILD_ID		SM_BUILD_UNIQUEID
+# define SOURCEMOD_BUILD_TIME 	SM_BUILD_TIMESTAMP
+#endif
+
 #endif /* _INCLUDE_SOURCEMOD_VERSION_INFORMATION_H_ */
 

pushbuild.txt

@@ -4,7 +4,6 @@ joys of buildbot, part 3: an accidental event proves troublesome for a psychic f
 joys of buildbot, part 4: a transient mummy is perplexed by a broken wand
 buildbot has horrible blugs
 i am the very model of a modern major general
-
 It's no wonder the build always falls over when we call it pushing.
 h
 i
@@ -21,10 +20,6 @@ Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS!
   THE PANTS COMMAND COMMAND ME! DO NOT IGNORE MY VEINS.
 This file sure has gotten big.
 sawce loves anime, sushi, and macs
-u
-not me
-skull man was here
-oh
 javaliabuf64k..
 "line 29" rhymes... kinda. <-- CONFIRMED
 The Patty Winters show this morning was about Real-Life Rambos.
@@ -67,3 +62,4 @@ s
 the eggs in spain stay mainly on the plain
 ur truly fixed
 im a gentleman honey farmer
+all I've got back here are my bees!

sourcepawn/compiler/AMBuilder

@@ -1,72 +1,75 @@
 # vim: set ts=2 sw=2 tw=99 noet ft=python: 
 import os
 
-compiler = SM.DefaultCompiler()
-compiler['CINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public'))
-compiler['CINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn'))
-compiler['CINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'sourcepawn', 'compiler'))
-compiler['CINCLUDES'].append(os.path.join(AMBuild.outputFolder, 'includes'))
-
-if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang':
-	compiler['CFLAGS'].extend(['-Wno-parentheses', '-Wno-format'])
-	if AMBuild.target['platform'] == 'linux':
-		compiler['POSTLINKFLAGS'].extend(['-lgcc', '-lm'])
-elif compiler.cc.name == 'msvc':
-	compiler['POSTLINKFLAGS'].remove('/SUBSYSTEM:WINDOWS')
-	compiler['POSTLINKFLAGS'].append('/SUBSYSTEM:CONSOLE')
-
-if AMBuild.target['platform'] == 'linux':
-	compiler['CDEFINES'].extend(['LINUX', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC', '_GNU_SOURCE'])
-elif AMBuild.target['platform'] == 'darwin':
-	compiler['CDEFINES'].extend(['DARWIN', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC'])
-
-extension = AMBuild.AddJob('spcomp')
-binary = Cpp.ExecutableBuilder('spcomp', AMBuild, extension, compiler)
-files = [
-	'libpawnc.c',
-	'lstring.c',
-	'memfile.c',
-	'pawncc.c',
-	'sc1.c',
-	'sc2.c',
-	'sc3.c',
-	'sc4.c',
-	'sc5.c',
-	'sc6.c',
-	'sc7.c',
-	'scexpand.c',
-	'sci18n.c',
-	'sclist.c',
-	'scmemfil.c',
-	'scstate.c',
-	'sctracker.c',
-	'scvars.c',
-	'sp_file.c',
-	'zlib/adler32.c',
-	'zlib/compress.c',
-	'zlib/crc32.c',
-	'zlib/deflate.c',
-	'zlib/gzio.c',
-	'zlib/infback.c',
-	'zlib/inffast.c',
-	'zlib/inflate.c',
-	'zlib/inftrees.c',
-	'zlib/trees.c',
-	'zlib/uncompr.c',
-	'zlib/zutil.c',
-	'sp_symhash.c'
-	]
-if AMBuild.target['platform'] == 'linux':
-	files.append('binreloc.c')
-binary.AddSourceFiles('sourcepawn/compiler', files)
-
-if AMBuild.target['platform'] == 'windows':
-	env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
-	binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env)
-elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder):
-	binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0'])
-	binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']])
-
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
-
+binary = SM.Program(builder, 'spcomp')
+compiler = binary.compiler
+compiler.includes += [
+  os.path.join(builder.sourcePath, 'public'),
+  os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
+  os.path.join(builder.sourcePath, 'sourcepawn', 'compiler'),
+  os.path.join(builder.buildPath, 'includes'),
+]
+ 
+if compiler.cc.behavior == 'gcc':
+  compiler.cflags += ['-Wno-format']
+  if builder.target_platform == 'linux':
+    compiler.postlink += ['-lgcc', '-lm']
+elif compiler.cc.behavior == 'msvc':
+  compiler.linkflags.remove('/SUBSYSTEM:WINDOWS')
+  compiler.linkflags.append('/SUBSYSTEM:CONSOLE')
+ 
+if builder.target_platform == 'linux':
+  compiler.defines += [
+    'LINUX',
+    'HAVE_STDINT_H',
+    'AMX_ANSIONLY',
+    'ENABLE_BINRELOC',
+    '_GNU_SOURCE'
+  ]
+elif builder.target_platform == 'mac':
+  compiler.defines += [
+    'DARWIN',
+    'HAVE_STDINT_H',
+    'AMX_ANSIONLY',
+    'ENABLE_BINRELOC',
+    'HAVE_SAFESTR'
+  ]
+ 
+binary.sources += [
+  'libpawnc.c',
+  'lstring.c',
+  'memfile.c',
+  'pawncc.c',
+  'sc1.c',
+  'sc2.c',
+  'sc3.c',
+  'sc4.c',
+  'sc5.c',
+  'sc6.c',
+  'sc7.c',
+  'scexpand.c',
+  'sci18n.c',
+  'sclist.c',
+  'scmemfil.c',
+  'scstate.c',
+  'sctracker.c',
+  'scvars.c',
+  'sp_file.c',
+  'zlib/adler32.c',
+  'zlib/compress.c',
+  'zlib/crc32.c',
+  'zlib/deflate.c',
+  'zlib/gzio.c',
+  'zlib/infback.c',
+  'zlib/inffast.c',
+  'zlib/inflate.c',
+  'zlib/inftrees.c',
+  'zlib/trees.c',
+  'zlib/uncompr.c',
+  'zlib/zutil.c',
+  'sp_symhash.c'
+]
+if builder.target_platform == 'linux':
+  binary.sources.append('binreloc.c')
+ 
+SM.spcomp = builder.Add(binary)

sourcepawn/compiler/sc.h

@@ -809,6 +809,7 @@ SC_VDECL int sc_needsemicolon;/* semicolon required to terminate expressions? */
 SC_VDECL int sc_dataalign;    /* data alignment value */
 SC_VDECL int sc_alignnext;    /* must frame of the next function be aligned? */
 SC_VDECL int pc_docexpr;      /* must expression be attached to documentation comment? */
+SC_VDECL int sc_showincludes; /* show include files? */
 SC_VDECL int curseg;          /* 1 if currently parsing CODE, 2 if parsing DATA */
 SC_VDECL cell pc_stksize;     /* stack size */
 SC_VDECL cell pc_amxlimit;    /* abstract machine size limit (code + data, or only code) */

sourcepawn/compiler/sc1.c

@@ -267,7 +267,9 @@ int pc_compile(int argc, char *argv[])
       tname=NULL;
       sname=NULL;
     #else
-      tname=tempnam(NULL,"pawn");
+      char *buffer = strdup(P_tmpdir "/pawn.XXXXXX");
+      close(mkstemp(buffer));
+      tname=buffer;
     #endif
     ftmp=(FILE*)pc_createsrc(tname);
     for (fidx=0; (sname=get_sourcefile(fidx))!=NULL; fidx++) {
@@ -851,11 +853,11 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
   int arg,i,isoption;
 
   for (arg=1; arg<argc; arg++) {
-    #if DIRSEP_CHAR=='/'
-      isoption= argv[arg][0]=='-';
-    #else
-      isoption= argv[arg][0]=='/' || argv[arg][0]=='-';
-    #endif
+#if DIRSEP_CHAR=='/'
+    isoption= argv[arg][0]=='-';
+#else
+    isoption= argv[arg][0]=='/' || argv[arg][0]=='-';
+#endif
     if (isoption) {
       ptr=&argv[arg][1];
       switch (*ptr) {
@@ -925,6 +927,9 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
           hwndFinish=(HWND)0;
         break;
 #endif
+      case 'h':
+        sc_showincludes = 1;
+        break;
       case 'i':
         strlcpy(str,option_value(ptr),sizeof str);  /* set name of include directory */
         i=strlen(str);
@@ -1233,7 +1238,7 @@ static void setconfig(char *root)
 
 static void setcaption(void)
 {
-  pc_printf("SourcePawn Compiler " SM_VERSION_STRING "\n");
+  pc_printf("SourcePawn Compiler %s\n", SOURCEMOD_VERSION);
   pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2008 AlliedModders, LLC\n\n");
 }
 
@@ -1263,6 +1268,7 @@ static void about(void)
 #if defined	__WIN32__ || defined _WIN32 || defined _Windows
     pc_printf("         -H<hwnd> window handle to send a notification message on finish\n");
 #endif
+    pc_printf("         -h       show included file paths\n");
     pc_printf("         -i<name> path for include files\n");
     pc_printf("         -l       create list file (preprocess only)\n");
     pc_printf("         -o<name> set base name of (P-code) output file\n");