Bintools extension no longer needs a separate build for each engine (bug 4548, r=dvander).

core/ExtensionSys.cpp

@@ -87,6 +87,12 @@ CLocalExtension::CLocalExtension(const char *filename)
 
 	char path[PLATFORM_MAX_PATH];
 
+	/* Special case for new bintools binary */
+	if (strcmp(filename, "bintools.ext") == 0)
+	{
+		goto normal;
+	}
+
 	/* Zeroth, see if there is an engine specific build in the new place. */
 	g_SourceMod.BuildPath(Path_SM,
 		path,
@@ -106,6 +112,7 @@ CLocalExtension::CLocalExtension(const char *filename)
 		"extensions/auto." GAMEFIX "/%s." PLATFORM_LIB_EXT,
 		filename);
 
+normal:
 	/* Try the "normal" version */
 	if (!g_LibSys.IsPathFile(path))
 	{

core/sourcemod.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 sw=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -737,5 +737,13 @@ int SourceModBase::GetPluginId()
 	return g_PLID;
 }
 
+int SourceModBase::GetShApiVersion()
+{
+	int api, impl;
+	g_SMAPI->GetShVersions(api, impl);
+
+	return api;
+}
+
 SMGlobalClass *SMGlobalClass::head = NULL;
 

core/sourcemod.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -134,6 +134,7 @@ public: // ISourceMod
 	void AddFrameAction(FRAMEACTION fn, void *data);
 	const char *GetCoreConfigValue(const char *key);
 	int GetPluginId();
+	int GetShApiVersion();
 private:
 	CStack<CDataPack *> m_freepacks;
 	char m_SMBaseDir[PLATFORM_MAX_PATH];