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

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)