Merge branch 'master' of github.com:KyleSanderson/SteamWorks

Extension/AMBuilder

@@ -0,0 +1,35 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os
+
+project = SteamWorks.HL2Project(builder, 'SteamWorks.ext')
+project.sources += [
+  'extension.cpp',
+  'swgameserver.cpp',
+  'swgamedata.cpp',
+  'swforwards.cpp',
+  'gsnatives.cpp',
+  'swgshooks.cpp',
+  'swgsdetours.cpp',
+  'ssnatives.cpp',
+  'swhttp.cpp',
+  'swhttprequest.cpp',
+  'sdk/smsdk_ext.cpp',
+  'CDetour/detours.cpp',
+  'asm/asm.c'
+]
+
+for sdk_name in SteamWorks.sdks:
+  sdk = SteamWorks.sdks[sdk_name]
+
+  binary = SteamWorks.HL2Config(project, 'SteamWorks.ext', sdk)
+  
+  binary.compiler.defines += ['META_NO_HL2SDK', 'SOURCEMOD_BUILD', 'VERSION_SAFE_STEAM_API_INTERFACES']
+  binary.compiler.cxxincludes += [os.path.join(SteamWorks.steamworks_root, 'public', 'steam'), os.path.join(sdk.path, 'public', 'steam')];
+  
+  if builder.target_platform == 'linux':
+    binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'linux32', 'libsteam_api.so'),;
+	
+  if builder.target_platform == 'windows':
+    binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'steam_api.lib'),;
+
+SteamWorks.extensions += builder.Add(project)

Extension/swgsdetours.cpp

@@ -60,7 +60,11 @@ SteamWorksGSDetours::SteamWorksGSDetours()
 		pConfig = g_SteamWorks.pSWGameData->GetGameData();
 		if (pConfig)
 		{
-			pLibSteamPath = pConfig->GetKeyValue("LibSteamAPI");
+			const char *kvLibSteamAPI = pConfig->GetKeyValue("LibSteamAPI");
+			if (kvLibSteamAPI)
+			{
+				pLibSteamPath = kvLibSteamAPI;
+			}
 		}
 	}