Merge AMBuild2 upgrade from sourcemod-1.6 to sourcemod-1.5.

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 is '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

@@ -350,12 +350,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)