Removed auto folders (bug 3949).
1.1 --- a/core/ExtensionSys.cpp Mon Aug 24 09:41:53 2009 +1200
1.2 +++ b/core/ExtensionSys.cpp Sun Aug 30 00:03:58 2009 -0700
1.3 @@ -1,8 +1,8 @@
1.4 /**
1.5 - * vim: set ts=4 :
1.6 + * vim: set ts=4 sw=4 tw=99 noet :
1.7 * =============================================================================
1.8 * SourceMod
1.9 - * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
1.10 + * Copyright (C) 2004-2009 AlliedModders LLC. All rights reserved.
1.11 * =============================================================================
1.12 *
1.13 * This program is free software; you can redistribute it and/or modify it under
1.14 @@ -49,6 +49,9 @@
1.15 m_bFullyLoaded = false;
1.16 m_File.assign(filename);
1.17 m_Path.assign(path);
1.18 + char real_name[PLATFORM_MAX_PATH];
1.19 + g_LibSys.GetFileFromPath(real_name, sizeof(real_name), m_Path.c_str());
1.20 + m_RealFile.assign(real_name);
1.21 }
1.22
1.23 CRemoteExtension::CRemoteExtension(IExtensionInterface *pAPI, const char *filename, const char *path)
1.24 @@ -57,6 +60,22 @@
1.25 m_pAPI = pAPI;
1.26 }
1.27
1.28 +#if defined METAMOD_PLAPI_VERSION
1.29 +#if SOURCE_ENGINE == SE_LEFT4DEAD
1.30 +#define GAMEFIX "2.l4d"
1.31 +#elif SOURCE_ENGINE == SE_ORANGEBOX
1.32 +#define GAMEFIX "2.ep2"
1.33 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
1.34 +#define GAMEFIX "2.ep2v"
1.35 +#elif SOURCE_ENGINE == SE_DARKMESSIAH
1.36 +#define GAMEFIX "2.darkm"
1.37 +#else
1.38 +#define GAMEFIX "2.ep1"
1.39 +#endif //SOURCE_ENGINE == SE_LEFT4DEAD
1.40 +#else //METAMOD_PLAPI_VERSION
1.41 +#define GAMEFIX "1.ep1"
1.42 +#endif //METAMOD_PLAPI_VERSION
1.43 +
1.44 CLocalExtension::CLocalExtension(const char *filename)
1.45 {
1.46 m_PlId = 0;
1.47 @@ -64,33 +83,36 @@
1.48
1.49 char path[PLATFORM_MAX_PATH];
1.50
1.51 + /* Zeroth, see if there is an engine specific build in the new place. */
1.52 + g_SourceMod.BuildPath(Path_SM,
1.53 + path,
1.54 + PLATFORM_MAX_PATH,
1.55 + "extensions/%s." GAMEFIX "." PLATFORM_LIB_EXT,
1.56 + filename);
1.57 +
1.58 + if (g_LibSys.IsPathFile(path))
1.59 + {
1.60 + goto found;
1.61 + }
1.62 +
1.63 /* First see if there is an engine specific build! */
1.64 g_SourceMod.BuildPath(Path_SM,
1.65 path,
1.66 - PLATFORM_MAX_PATH,
1.67 -#if defined METAMOD_PLAPI_VERSION
1.68 -#if SOURCE_ENGINE == SE_LEFT4DEAD
1.69 - "extensions/auto.2.l4d/%s",
1.70 -#elif SOURCE_ENGINE == SE_ORANGEBOX
1.71 - "extensions/auto.2.ep2/%s",
1.72 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
1.73 - "extensions/auto.2.ep2valve/%s",
1.74 -#elif SOURCE_ENGINE == SE_DARKMESSIAH
1.75 - "extensions/auto.2.darkm/%s",
1.76 -#else
1.77 - "extensions/auto.2.ep1/%s",
1.78 -#endif //SOURCE_ENGINE == SE_LEFT4DEAD
1.79 -#else //METAMOD_PLAPI_VERSION
1.80 - "extensions/auto.1.ep1/%s",
1.81 -#endif //METAMOD_PLAPI_VERSION
1.82 + PLATFORM_MAX_PATH,
1.83 + "extensions/auto." GAMEFIX "/%s." PLATFORM_LIB_EXT,
1.84 filename);
1.85
1.86 /* Try the "normal" version */
1.87 if (!g_LibSys.IsPathFile(path))
1.88 {
1.89 - g_SourceMod.BuildPath(Path_SM, path, PLATFORM_MAX_PATH, "extensions/%s", filename);
1.90 + g_SourceMod.BuildPath(Path_SM,
1.91 + path,
1.92 + PLATFORM_MAX_PATH,
1.93 + "extensions/%s." PLATFORM_LIB_EXT,
1.94 + filename);
1.95 }
1.96
1.97 +found:
1.98 Initialize(filename, path);
1.99 }
1.100
1.101 @@ -310,7 +332,7 @@
1.102
1.103 const char *CExtension::GetFilename()
1.104 {
1.105 - return m_File.c_str();
1.106 + return m_RealFile.c_str();
1.107 }
1.108
1.109 IdentityToken_t *CExtension::GetIdentity()
1.110 @@ -513,7 +535,7 @@
1.111
1.112 char file[PLATFORM_MAX_PATH];
1.113 len = UTIL_Format(file, sizeof(file), "%s", lfile);
1.114 - strcpy(&file[len - 9], ".ext." PLATFORM_LIB_EXT);
1.115 + strcpy(&file[len - 9], ".ext");
1.116
1.117 LoadAutoExtension(file);
1.118
1.119 @@ -523,11 +545,14 @@
1.120
1.121 IExtension *CExtensionManager::LoadAutoExtension(const char *path)
1.122 {
1.123 - if (!strstr(path, "." PLATFORM_LIB_EXT))
1.124 + /* Remove platform extension if it's there. Compat hack. */
1.125 + const char *ext = g_LibSys.GetFileExtension(path);
1.126 + if (strcmp(ext, PLATFORM_LIB_EXT) == 0)
1.127 {
1.128 - char newpath[PLATFORM_MAX_PATH];
1.129 - g_LibSys.PathFormat(newpath, sizeof(newpath), "%s.%s", path, PLATFORM_LIB_EXT);
1.130 - return LoadAutoExtension(newpath);
1.131 + char path2[PLATFORM_MAX_PATH];
1.132 + UTIL_Format(path2, sizeof(path2), "%s", path);
1.133 + path2[strlen(path) - strlen(PLATFORM_LIB_EXT) - 1] = '\0';
1.134 + return LoadAutoExtension(path2);
1.135 }
1.136
1.137 IExtension *pAlready;
1.138 @@ -565,24 +590,12 @@
1.139 for (iter=m_Libs.begin(); iter!=m_Libs.end(); iter++)
1.140 {
1.141 pExt = (*iter);
1.142 - char short_file[PLATFORM_MAX_PATH];
1.143 - g_LibSys.GetFileFromPath(short_file, sizeof(short_file), pExt->GetFilename());
1.144 - if (strcmp(lookup, short_file) == 0)
1.145 + if (pExt->IsSameFile(lookup))
1.146 {
1.147 return pExt;
1.148 }
1.149 }
1.150
1.151 - /* If we got no results, test if there was a platform extension.
1.152 - * If not, add one.
1.153 - */
1.154 - if (!strstr(file, "." PLATFORM_LIB_EXT))
1.155 - {
1.156 - char path[PLATFORM_MAX_PATH];
1.157 - UTIL_Format(path, sizeof(path), "%s.%s", file, PLATFORM_LIB_EXT);
1.158 - return FindExtensionByFile(path);
1.159 - }
1.160 -
1.161 return NULL;
1.162 }
1.163
1.164 @@ -620,6 +633,16 @@
1.165
1.166 IExtension *CExtensionManager::LoadExtension(const char *file, char *error, size_t maxlength)
1.167 {
1.168 + /* Remove platform extension if it's there. Compat hack. */
1.169 + const char *ext = g_LibSys.GetFileExtension(file);
1.170 + if (strcmp(ext, PLATFORM_LIB_EXT) == 0)
1.171 + {
1.172 + char path2[PLATFORM_MAX_PATH];
1.173 + UTIL_Format(path2, sizeof(path2), "%s", file);
1.174 + path2[strlen(file) - strlen(PLATFORM_LIB_EXT) - 1] = '\0';
1.175 + return LoadExtension(path2, error, maxlength);
1.176 + }
1.177 +
1.178 IExtension *pAlready;
1.179 if ((pAlready=FindExtensionByFile(file)) != NULL)
1.180 {
1.181 @@ -963,7 +986,7 @@
1.182 {
1.183 if (argcount < 4)
1.184 {
1.185 - g_RootMenu.ConsolePrint("[SM] Usage: sm exts info <#>");
1.186 + g_RootMenu.ConsolePrint("[SM] Usage: sm info <#>");
1.187 return;
1.188 }
1.189
1.190 @@ -971,7 +994,7 @@
1.191 unsigned int id = atoi(sId);
1.192 if (id <= 0)
1.193 {
1.194 - g_RootMenu.ConsolePrint("[SM] Usage: sm exts info <#>");
1.195 + g_RootMenu.ConsolePrint("[SM] Usage: sm info <#>");
1.196 return;
1.197 }
1.198
1.199 @@ -1196,7 +1219,7 @@
1.200 }
1.201
1.202 return;
1.203 - }
1.204 + }
1.205 else
1.206 {
1.207 g_RootMenu.ConsolePrint("[SM] Extension %s is not loaded.", pExt->GetFilename());
1.208 @@ -1306,3 +1329,16 @@
1.209 }
1.210 }
1.211 }
1.212 +
1.213 +bool CLocalExtension::IsSameFile(const char *file)
1.214 +{
1.215 + /* Only care about the shortened name. */
1.216 + return strcmp(file, m_File.c_str()) == 0;
1.217 +}
1.218 +
1.219 +bool CRemoteExtension::IsSameFile(const char *file)
1.220 +{
1.221 + /* :TODO: this could be better, but no one uses this API anyway. */
1.222 + return strcmp(file, m_Path.c_str()) == 0;
1.223 +}
1.224 +
2.1 --- a/core/ExtensionSys.h Mon Aug 24 09:41:53 2009 +1200
2.2 +++ b/core/ExtensionSys.h Sun Aug 30 00:03:58 2009 -0700
2.3 @@ -84,6 +84,7 @@
2.4 virtual bool IsLoaded() =0;
2.5 virtual void Unload() =0;
2.6 virtual bool Reload(char *error, size_t maxlength) =0;
2.7 + virtual bool IsSameFile(const char* file) =0;
2.8 protected:
2.9 void Initialize(const char *filename, const char *path);
2.10 bool PerformAPICheck(char *error, size_t maxlength);
2.11 @@ -93,6 +94,7 @@
2.12 IdentityToken_t *m_pIdentToken;
2.13 IExtensionInterface *m_pAPI;
2.14 String m_File;
2.15 + String m_RealFile;
2.16 String m_Path;
2.17 String m_Error;
2.18 List<IfaceInfo> m_Deps; /** Dependencies */
2.19 @@ -113,6 +115,7 @@
2.20 void Unload();
2.21 bool Reload(char *error, size_t maxlength);
2.22 bool IsExternal();
2.23 + bool IsSameFile(const char *file);
2.24 private:
2.25 PluginId m_PlId;
2.26 ILibrary *m_pLib;
2.27 @@ -128,6 +131,7 @@
2.28 void Unload();
2.29 bool Reload(char *error, size_t maxlength);
2.30 bool IsExternal();
2.31 + bool IsSameFile(const char *file);
2.32 };
2.33
2.34 class CExtensionManager :
3.1 --- a/core/Makefile Mon Aug 24 09:41:53 2009 +1200
3.2 +++ b/core/Makefile Sun Aug 30 00:03:58 2009 -0700
3.3 @@ -78,7 +78,7 @@
3.4 METAMOD = $(MMSOURCE17)/core
3.5 INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common
3.6 SRCDS = $(SRCDS_BASE)/orangebox
3.7 - BINARY = sourcemod.2.ep2valve.so
3.8 + BINARY = sourcemod.2.ep2v.so
3.9 override ENGSET = true
3.10 endif
3.11 ifeq "$(ENGINE)" "left4dead"
4.1 --- a/core/msvc9/sourcemod_mm.vcproj Mon Aug 24 09:41:53 2009 +1200
4.2 +++ b/core/msvc9/sourcemod_mm.vcproj Sun Aug 30 00:03:58 2009 -0700
4.3 @@ -1302,7 +1302,7 @@
4.4 <Tool
4.5 Name="VCLinkerTool"
4.6 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib" dbghelp.lib "Wsock32.lib""
4.7 - OutputFile="$(OutDir)\sourcemod.2.ep2valve.dll"
4.8 + OutputFile="$(OutDir)\sourcemod.2.ep2v.dll"
4.9 LinkIncremental="2"
4.10 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
4.11 GenerateDebugInformation="true"
4.12 @@ -1384,7 +1384,7 @@
4.13 <Tool
4.14 Name="VCLinkerTool"
4.15 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib" "Wsock32.lib""
4.16 - OutputFile="$(OutDir)\sourcemod.2.ep2valve.dll"
4.17 + OutputFile="$(OutDir)\sourcemod.2.ep2v.dll"
4.18 LinkIncremental="2"
4.19 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
4.20 GenerateDebugInformation="true"
4.21 @@ -1465,7 +1465,7 @@
4.22 <Tool
4.23 Name="VCLinkerTool"
4.24 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib" "Wsock32.lib""
4.25 - OutputFile="$(OutDir)\sourcemod.2.ep2valve.dll"
4.26 + OutputFile="$(OutDir)\sourcemod.2.ep2v.dll"
4.27 LinkIncremental="1"
4.28 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
4.29 GenerateDebugInformation="true"
5.1 --- a/extensions/bintools/Makefile Mon Aug 24 09:41:53 2009 +1200
5.2 +++ b/extensions/bintools/Makefile Sun Aug 30 00:03:58 2009 -0700
5.3 @@ -37,9 +37,8 @@
5.4 INCLUDE += -I$(HL2SDK)/public/dlls
5.5 INCLUDE += -I$(MMSOURCE17)/core -I$(MMSOURCE17)/core/sourcehook
5.6 SRCDS = $(SRCDS_BASE)
5.7 + GAMEFIX = 1.ep1
5.8 override ENGSET = true
5.9 - USEMETA = true
5.10 - CFLAGS += -DHOOKING_ENABLED
5.11 endif
5.12 ifeq "$(ENGINE)" "orangebox"
5.13 HL2SDK = $(HL2SDK_OB)
5.14 @@ -49,6 +48,7 @@
5.15 METAMOD = $(MMSOURCE17)/core
5.16 INCLUDE += -I$(HL2SDK)/public/game/server
5.17 SRCDS = $(SRCDS_BASE)/orangebox
5.18 + GAMEFIX = 2.ep2
5.19 override ENGSET = true
5.20 USEMETA = true
5.21 CFLAGS += -DHOOKING_ENABLED
5.22 @@ -61,6 +61,7 @@
5.23 METAMOD = $(MMSOURCE17)/core
5.24 INCLUDE += -I$(HL2SDK)/public/game/server
5.25 SRCDS = $(SRCDS_BASE)/orangebox
5.26 + GAMEFIX = 2.ep2v
5.27 override ENGSET = true
5.28 USEMETA = true
5.29 CFLAGS += -DHOOKING_ENABLED
5.30 @@ -73,6 +74,7 @@
5.31 METAMOD = $(MMSOURCE17)/core
5.32 INCLUDE += -I$(HL2SDK)/public/game/server
5.33 SRCDS = $(SRCDS_BASE)/l4d
5.34 + GAMEFIX = 2.l4d
5.35 override ENGSET = true
5.36 USEMETA = true
5.37 CFLAGS += -DHOOKING_ENABLED
5.38 @@ -120,10 +122,10 @@
5.39 OS := $(shell uname -s)
5.40 ifeq "$(OS)" "Darwin"
5.41 LINK += -dynamiclib
5.42 - BINARY = $(PROJECT).ext.dylib
5.43 + BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
5.44 else
5.45 LINK += -static-libgcc -shared
5.46 - BINARY = $(PROJECT).ext.so
5.47 + BINARY = $(PROJECT).ext.$(GAMEFIX).so
5.48 endif
5.49
5.50 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
6.1 --- a/extensions/bintools/msvc9/bintools.vcproj Mon Aug 24 09:41:53 2009 +1200
6.2 +++ b/extensions/bintools/msvc9/bintools.vcproj Sun Aug 30 00:03:58 2009 -0700
6.3 @@ -59,6 +59,7 @@
6.4 />
6.5 <Tool
6.6 Name="VCResourceCompilerTool"
6.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.8 />
6.9 <Tool
6.10 Name="VCPreLinkEventTool"
6.11 @@ -66,7 +67,7 @@
6.12 <Tool
6.13 Name="VCLinkerTool"
6.14 AdditionalDependencies=""$(HL2SDKOB)\lib\public\tier0.lib" "$(HL2SDKOB)\lib\public\tier1.lib" "$(HL2SDKOB)\lib\public\vstdlib.lib" "$(HL2SDKOB)\lib\public\mathlib.lib""
6.15 - OutputFile="$(OutDir)\bintools.ext.dll"
6.16 + OutputFile="$(OutDir)\bintools.ext.2.ep2.dll"
6.17 LinkIncremental="2"
6.18 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
6.19 GenerateDebugInformation="true"
6.20 @@ -139,6 +140,7 @@
6.21 />
6.22 <Tool
6.23 Name="VCResourceCompilerTool"
6.24 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.25 />
6.26 <Tool
6.27 Name="VCPreLinkEventTool"
6.28 @@ -146,7 +148,7 @@
6.29 <Tool
6.30 Name="VCLinkerTool"
6.31 AdditionalDependencies=""$(HL2SDKOB)\lib\public\tier0.lib" "$(HL2SDKOB)\lib\public\tier1.lib" "$(HL2SDKOB)\lib\public\vstdlib.lib" "$(HL2SDKOB)\lib\public\mathlib.lib""
6.32 - OutputFile="$(OutDir)\bintools.ext.dll"
6.33 + OutputFile="$(OutDir)\bintools.ext.2.ep2.dll"
6.34 LinkIncremental="1"
6.35 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
6.36 GenerateDebugInformation="true"
6.37 @@ -218,6 +220,7 @@
6.38 />
6.39 <Tool
6.40 Name="VCResourceCompilerTool"
6.41 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.42 />
6.43 <Tool
6.44 Name="VCPreLinkEventTool"
6.45 @@ -225,7 +228,7 @@
6.46 <Tool
6.47 Name="VCLinkerTool"
6.48 AdditionalDependencies=""$(HL2SDKL4D)\lib\public\tier0.lib" "$(HL2SDKL4D)\lib\public\tier1.lib" "$(HL2SDKL4D)\lib\public\vstdlib.lib" "$(HL2SDKL4D)\lib\public\mathlib.lib""
6.49 - OutputFile="$(OutDir)\bintools.ext.dll"
6.50 + OutputFile="$(OutDir)\bintools.ext.2.l4d.dll"
6.51 LinkIncremental="2"
6.52 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
6.53 GenerateDebugInformation="true"
6.54 @@ -291,6 +294,7 @@
6.55 />
6.56 <Tool
6.57 Name="VCResourceCompilerTool"
6.58 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.59 />
6.60 <Tool
6.61 Name="VCPreLinkEventTool"
6.62 @@ -298,7 +302,7 @@
6.63 <Tool
6.64 Name="VCLinkerTool"
6.65 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
6.66 - OutputFile="$(OutDir)\bintools.ext.dll"
6.67 + OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
6.68 LinkIncremental="2"
6.69 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
6.70 GenerateDebugInformation="true"
6.71 @@ -364,6 +368,7 @@
6.72 />
6.73 <Tool
6.74 Name="VCResourceCompilerTool"
6.75 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.76 />
6.77 <Tool
6.78 Name="VCPreLinkEventTool"
6.79 @@ -371,7 +376,7 @@
6.80 <Tool
6.81 Name="VCLinkerTool"
6.82 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
6.83 - OutputFile="$(OutDir)\bintools.ext.dll"
6.84 + OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
6.85 LinkIncremental="2"
6.86 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
6.87 GenerateDebugInformation="true"
6.88 @@ -440,6 +445,7 @@
6.89 />
6.90 <Tool
6.91 Name="VCResourceCompilerTool"
6.92 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.93 />
6.94 <Tool
6.95 Name="VCPreLinkEventTool"
6.96 @@ -447,7 +453,7 @@
6.97 <Tool
6.98 Name="VCLinkerTool"
6.99 AdditionalDependencies=""$(HL2SDKL4D)\lib\public\tier0.lib" "$(HL2SDKL4D)\lib\public\tier1.lib" "$(HL2SDKL4D)\lib\public\vstdlib.lib" "$(HL2SDKL4D)\lib\public\mathlib.lib""
6.100 - OutputFile="$(OutDir)\bintools.ext.dll"
6.101 + OutputFile="$(OutDir)\bintools.ext.2.l4d.dll"
6.102 LinkIncremental="1"
6.103 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
6.104 GenerateDebugInformation="true"
6.105 @@ -522,6 +528,7 @@
6.106 />
6.107 <Tool
6.108 Name="VCResourceCompilerTool"
6.109 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.110 />
6.111 <Tool
6.112 Name="VCPreLinkEventTool"
6.113 @@ -529,7 +536,7 @@
6.114 <Tool
6.115 Name="VCLinkerTool"
6.116 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
6.117 - OutputFile="$(OutDir)\bintools.ext.dll"
6.118 + OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
6.119 LinkIncremental="1"
6.120 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
6.121 GenerateDebugInformation="true"
6.122 @@ -604,6 +611,7 @@
6.123 />
6.124 <Tool
6.125 Name="VCResourceCompilerTool"
6.126 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.127 />
6.128 <Tool
6.129 Name="VCPreLinkEventTool"
6.130 @@ -611,7 +619,7 @@
6.131 <Tool
6.132 Name="VCLinkerTool"
6.133 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
6.134 - OutputFile="$(OutDir)\bintools.ext.dll"
6.135 + OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
6.136 LinkIncremental="1"
6.137 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
6.138 GenerateDebugInformation="true"
6.139 @@ -683,6 +691,7 @@
6.140 />
6.141 <Tool
6.142 Name="VCResourceCompilerTool"
6.143 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.144 />
6.145 <Tool
6.146 Name="VCPreLinkEventTool"
6.147 @@ -690,7 +699,7 @@
6.148 <Tool
6.149 Name="VCLinkerTool"
6.150 AdditionalDependencies=""$(HL2SDK-DARKM)\lib\public\tier0.lib" "$(HL2SDK-DARKM)\lib\public\tier1.lib" "$(HL2SDK-DARKM)\lib\public\vstdlib.lib" "$(HL2SDK-DARKM)\lib\public\mathlib.lib""
6.151 - OutputFile="$(OutDir)\bintools.ext.dll"
6.152 + OutputFile="$(OutDir)\bintools.ext.2.darkm.dll"
6.153 LinkIncremental="2"
6.154 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
6.155 GenerateDebugInformation="true"
6.156 @@ -759,6 +768,7 @@
6.157 />
6.158 <Tool
6.159 Name="VCResourceCompilerTool"
6.160 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.161 />
6.162 <Tool
6.163 Name="VCPreLinkEventTool"
6.164 @@ -766,7 +776,7 @@
6.165 <Tool
6.166 Name="VCLinkerTool"
6.167 AdditionalDependencies=""$(HL2SDK-DARKM)\lib\public\tier0.lib" "$(HL2SDK-DARKM)\lib\public\tier1.lib" "$(HL2SDK-DARKM)\lib\public\vstdlib.lib" "$(HL2SDK-DARKM)\lib\public\mathlib.lib""
6.168 - OutputFile="$(OutDir)\bintools.ext.dll"
6.169 + OutputFile="$(OutDir)\bintools.ext.2.darkm.dll"
6.170 LinkIncremental="1"
6.171 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
6.172 GenerateDebugInformation="true"
6.173 @@ -842,6 +852,7 @@
6.174 />
6.175 <Tool
6.176 Name="VCResourceCompilerTool"
6.177 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.178 />
6.179 <Tool
6.180 Name="VCPreLinkEventTool"
6.181 @@ -849,7 +860,7 @@
6.182 <Tool
6.183 Name="VCLinkerTool"
6.184 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib""
6.185 - OutputFile="$(OutDir)\bintools.ext.dll"
6.186 + OutputFile="$(OutDir)\bintools.ext.2.ep2v.dll"
6.187 LinkIncremental="2"
6.188 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
6.189 GenerateDebugInformation="true"
6.190 @@ -922,6 +933,7 @@
6.191 />
6.192 <Tool
6.193 Name="VCResourceCompilerTool"
6.194 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
6.195 />
6.196 <Tool
6.197 Name="VCPreLinkEventTool"
6.198 @@ -929,7 +941,7 @@
6.199 <Tool
6.200 Name="VCLinkerTool"
6.201 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib""
6.202 - OutputFile="$(OutDir)\bintools.ext.dll"
6.203 + OutputFile="$(OutDir)\bintools.ext.2.ep2v.dll"
6.204 LinkIncremental="1"
6.205 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
6.206 GenerateDebugInformation="true"
7.1 --- a/extensions/bintools/version.rc Mon Aug 24 09:41:53 2009 +1200
7.2 +++ b/extensions/bintools/version.rc Sun Aug 30 00:03:58 2009 -0700
7.3 @@ -50,7 +50,7 @@
7.4 VALUE "FileVersion", SVN_FULL_VERSION
7.5 VALUE "InternalName", "SourceMod BinTools Extension"
7.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
7.7 - VALUE "OriginalFilename", "bintools.ext.dll"
7.8 + VALUE "OriginalFilename", BINARY_NAME
7.9 VALUE "ProductName", "SourceMod BinTools Extension"
7.10 VALUE "ProductVersion", SVN_FULL_VERSION
7.11 END
8.1 --- a/extensions/clientprefs/msvc9/clientprefs.vcproj Mon Aug 24 09:41:53 2009 +1200
8.2 +++ b/extensions/clientprefs/msvc9/clientprefs.vcproj Sun Aug 30 00:03:58 2009 -0700
8.3 @@ -58,6 +58,7 @@
8.4 />
8.5 <Tool
8.6 Name="VCResourceCompilerTool"
8.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
8.8 />
8.9 <Tool
8.10 Name="VCPreLinkEventTool"
8.11 @@ -136,6 +137,7 @@
8.12 />
8.13 <Tool
8.14 Name="VCResourceCompilerTool"
8.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
8.16 />
8.17 <Tool
8.18 Name="VCPreLinkEventTool"
9.1 --- a/extensions/clientprefs/version.rc Mon Aug 24 09:41:53 2009 +1200
9.2 +++ b/extensions/clientprefs/version.rc Sun Aug 30 00:03:58 2009 -0700
9.3 @@ -50,7 +50,7 @@
9.4 VALUE "FileVersion", SVN_FULL_VERSION
9.5 VALUE "InternalName", "SourceMod Client Preferences Extension"
9.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
9.7 - VALUE "OriginalFilename", "clientprefs.ext.dll"
9.8 + VALUE "OriginalFilename", BINARY_NAME
9.9 VALUE "ProductName", "SourceMod Client Preferences Extension"
9.10 VALUE "ProductVersion", SVN_FULL_VERSION
9.11 END
10.1 --- a/extensions/cstrike/Makefile Mon Aug 24 09:41:53 2009 +1200
10.2 +++ b/extensions/cstrike/Makefile Sun Aug 30 00:03:58 2009 -0700
10.3 @@ -39,6 +39,7 @@
10.4 METAMOD = $(MMSOURCE17)/core-legacy
10.5 INCLUDE += -I$(HL2SDK)/public/dlls
10.6 SRCDS = $(SRCDS_BASE)
10.7 + GAMEFIX = 1.ep1
10.8 override ENGSET = true
10.9 endif
10.10 ifeq "$(ENGINE)" "orangebox"
10.11 @@ -49,6 +50,7 @@
10.12 METAMOD = $(MMSOURCE17)/core
10.13 INCLUDE += -I$(HL2SDK)/public/game/server
10.14 SRCDS = $(SRCDS_BASE)/orangebox
10.15 + GAMEFIX = 2.ep2
10.16 override ENGSET = true
10.17 endif
10.18 ifeq "$(ENGINE)" "orangeboxvalve"
10.19 @@ -59,6 +61,7 @@
10.20 METAMOD = $(MMSOURCE17)/core
10.21 INCLUDE += -I$(HL2SDK)/public/game/server
10.22 SRCDS = $(SRCDS_BASE)/orangebox
10.23 + GAMEFIX = 2.ep2v
10.24 override ENGSET = true
10.25 endif
10.26 ifeq "$(ENGINE)" "left4dead"
10.27 @@ -69,6 +72,7 @@
10.28 METAMOD = $(MMSOURCE17)/core
10.29 INCLUDE += -I$(HL2SDK)/public/game/server
10.30 SRCDS = $(SRCDS_BASE)/l4d
10.31 + GAMEFIX = 2.l4d
10.32 override ENGSET = true
10.33 endif
10.34
10.35 @@ -111,10 +115,10 @@
10.36 OS := $(shell uname -s)
10.37 ifeq "$(OS)" "Darwin"
10.38 LINK += -dynamiclib
10.39 - BINARY = $(PROJECT).ext.dylib
10.40 + BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
10.41 else
10.42 LINK += -static-libgcc -shared
10.43 - BINARY = $(PROJECT).ext.so
10.44 + BINARY = $(PROJECT).ext.$(GAMEFIX).so
10.45 endif
10.46
10.47 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
10.48 @@ -123,8 +127,6 @@
10.49 CPPFLAGS += $(CPP_GCC4_FLAGS)
10.50 endif
10.51
10.52 -BINARY = $(PROJECT).ext.so
10.53 -
10.54 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
10.55
10.56 $(BIN_DIR)/%.o: %.cpp
11.1 --- a/extensions/cstrike/msvc9/cstrike.vcproj Mon Aug 24 09:41:53 2009 +1200
11.2 +++ b/extensions/cstrike/msvc9/cstrike.vcproj Sun Aug 30 00:03:58 2009 -0700
11.3 @@ -58,6 +58,7 @@
11.4 />
11.5 <Tool
11.6 Name="VCResourceCompilerTool"
11.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
11.8 />
11.9 <Tool
11.10 Name="VCPreLinkEventTool"
11.11 @@ -65,7 +66,7 @@
11.12 <Tool
11.13 Name="VCLinkerTool"
11.14 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib""
11.15 - OutputFile="$(OutDir)\game.cstrike.ext.dll"
11.16 + OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
11.17 LinkIncremental="2"
11.18 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
11.19 GenerateDebugInformation="true"
11.20 @@ -137,6 +138,7 @@
11.21 />
11.22 <Tool
11.23 Name="VCResourceCompilerTool"
11.24 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
11.25 />
11.26 <Tool
11.27 Name="VCPreLinkEventTool"
11.28 @@ -144,7 +146,7 @@
11.29 <Tool
11.30 Name="VCLinkerTool"
11.31 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib""
11.32 - OutputFile="$(OutDir)\game.cstrike.ext.dll"
11.33 + OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
11.34 LinkIncremental="1"
11.35 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
11.36 GenerateDebugInformation="true"
11.37 @@ -219,6 +221,7 @@
11.38 />
11.39 <Tool
11.40 Name="VCResourceCompilerTool"
11.41 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
11.42 />
11.43 <Tool
11.44 Name="VCPreLinkEventTool"
11.45 @@ -226,7 +229,7 @@
11.46 <Tool
11.47 Name="VCLinkerTool"
11.48 AdditionalDependencies=""$(HL2SDKOB)\lib\public\tier0.lib" "$(HL2SDKOB)\lib\public\tier1.lib""
11.49 - OutputFile="$(OutDir)\game.cstrike.ext.dll"
11.50 + OutputFile="$(OutDir)\game.cstrike.ext.2.ep2.dll"
11.51 LinkIncremental="2"
11.52 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
11.53 GenerateDebugInformation="true"
11.54 @@ -298,6 +301,7 @@
11.55 />
11.56 <Tool
11.57 Name="VCResourceCompilerTool"
11.58 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
11.59 />
11.60 <Tool
11.61 Name="VCPreLinkEventTool"
11.62 @@ -305,7 +309,7 @@
11.63 <Tool
11.64 Name="VCLinkerTool"
11.65 AdditionalDependencies=""$(HL2SDKOB)\lib\public\tier0.lib" "$(HL2SDKOB)\lib\public\tier1.lib""
11.66 - OutputFile="$(OutDir)\game.cstrike.ext.dll"
11.67 + OutputFile="$(OutDir)\game.cstrike.ext.2.ep2.dll"
11.68 LinkIncremental="1"
11.69 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
11.70 GenerateDebugInformation="true"
11.71 @@ -380,6 +384,7 @@
11.72 />
11.73 <Tool
11.74 Name="VCResourceCompilerTool"
11.75 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
11.76 />
11.77 <Tool
11.78 Name="VCPreLinkEventTool"
11.79 @@ -387,7 +392,7 @@
11.80 <Tool
11.81 Name="VCLinkerTool"
11.82 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib""
11.83 - OutputFile="$(OutDir)\game.cstrike.ext.dll"
11.84 + OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
11.85 LinkIncremental="2"
11.86 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
11.87 GenerateDebugInformation="true"
11.88 @@ -459,6 +464,7 @@
11.89 />
11.90 <Tool
11.91 Name="VCResourceCompilerTool"
11.92 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
11.93 />
11.94 <Tool
11.95 Name="VCPreLinkEventTool"
11.96 @@ -466,7 +472,7 @@
11.97 <Tool
11.98 Name="VCLinkerTool"
11.99 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib""
11.100 - OutputFile="$(OutDir)\game.cstrike.ext.dll"
11.101 + OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
11.102 LinkIncremental="1"
11.103 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
11.104 GenerateDebugInformation="true"
12.1 --- a/extensions/cstrike/version.rc Mon Aug 24 09:41:53 2009 +1200
12.2 +++ b/extensions/cstrike/version.rc Sun Aug 30 00:03:58 2009 -0700
12.3 @@ -50,7 +50,7 @@
12.4 VALUE "FileVersion", SVN_FULL_VERSION
12.5 VALUE "InternalName", "SourceMod CS:S Extension"
12.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
12.7 - VALUE "OriginalFilename", "game.cstrike.ext.dll"
12.8 + VALUE "OriginalFilename", BINARY_NAME
12.9 VALUE "ProductName", "SourceMod CS:S Extension"
12.10 VALUE "ProductVersion", SVN_FULL_VERSION
12.11 END
13.1 --- a/extensions/curl/msvc9/curl.vcproj Mon Aug 24 09:41:53 2009 +1200
13.2 +++ b/extensions/curl/msvc9/curl.vcproj Sun Aug 30 00:03:58 2009 -0700
13.3 @@ -58,6 +58,7 @@
13.4 />
13.5 <Tool
13.6 Name="VCResourceCompilerTool"
13.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.8 />
13.9 <Tool
13.10 Name="VCPreLinkEventTool"
13.11 @@ -137,6 +138,7 @@
13.12 />
13.13 <Tool
13.14 Name="VCResourceCompilerTool"
13.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.16 />
13.17 <Tool
13.18 Name="VCPreLinkEventTool"
13.19 @@ -220,6 +222,7 @@
13.20 />
13.21 <Tool
13.22 Name="VCResourceCompilerTool"
13.23 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.24 />
13.25 <Tool
13.26 Name="VCPreLinkEventTool"
13.27 @@ -300,6 +303,7 @@
13.28 />
13.29 <Tool
13.30 Name="VCResourceCompilerTool"
13.31 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.32 />
13.33 <Tool
13.34 Name="VCPreLinkEventTool"
13.35 @@ -383,6 +387,7 @@
13.36 />
13.37 <Tool
13.38 Name="VCResourceCompilerTool"
13.39 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.40 />
13.41 <Tool
13.42 Name="VCPreLinkEventTool"
13.43 @@ -463,6 +468,7 @@
13.44 />
13.45 <Tool
13.46 Name="VCResourceCompilerTool"
13.47 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.48 />
13.49 <Tool
13.50 Name="VCPreLinkEventTool"
13.51 @@ -546,6 +552,7 @@
13.52 />
13.53 <Tool
13.54 Name="VCResourceCompilerTool"
13.55 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.56 />
13.57 <Tool
13.58 Name="VCPreLinkEventTool"
13.59 @@ -626,6 +633,7 @@
13.60 />
13.61 <Tool
13.62 Name="VCResourceCompilerTool"
13.63 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.64 />
13.65 <Tool
13.66 Name="VCPreLinkEventTool"
13.67 @@ -709,6 +717,7 @@
13.68 />
13.69 <Tool
13.70 Name="VCResourceCompilerTool"
13.71 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.72 />
13.73 <Tool
13.74 Name="VCPreLinkEventTool"
13.75 @@ -789,6 +798,7 @@
13.76 />
13.77 <Tool
13.78 Name="VCResourceCompilerTool"
13.79 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
13.80 />
13.81 <Tool
13.82 Name="VCPreLinkEventTool"
14.1 --- a/extensions/curl/version.rc Mon Aug 24 09:41:53 2009 +1200
14.2 +++ b/extensions/curl/version.rc Sun Aug 30 00:03:58 2009 -0700
14.3 @@ -50,7 +50,7 @@
14.4 VALUE "FileVersion", SVN_FULL_VERSION
14.5 VALUE "InternalName", "SourceMod Webternet Extension"
14.6 VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
14.7 - VALUE "OriginalFilename", "webternet.ext.dll"
14.8 + VALUE "OriginalFilename", BINARY_NAME
14.9 VALUE "ProductName", "SourceMod Webternet Extension"
14.10 VALUE "ProductVersion", SVN_FULL_VERSION
14.11 END
15.1 --- a/extensions/geoip/msvc9/geoip.vcproj Mon Aug 24 09:41:53 2009 +1200
15.2 +++ b/extensions/geoip/msvc9/geoip.vcproj Sun Aug 30 00:03:58 2009 -0700
15.3 @@ -58,6 +58,7 @@
15.4 />
15.5 <Tool
15.6 Name="VCResourceCompilerTool"
15.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
15.8 />
15.9 <Tool
15.10 Name="VCPreLinkEventTool"
15.11 @@ -137,6 +138,7 @@
15.12 />
15.13 <Tool
15.14 Name="VCResourceCompilerTool"
15.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
15.16 />
15.17 <Tool
15.18 Name="VCPreLinkEventTool"
16.1 --- a/extensions/geoip/version.rc Mon Aug 24 09:41:53 2009 +1200
16.2 +++ b/extensions/geoip/version.rc Sun Aug 30 00:03:58 2009 -0700
16.3 @@ -50,7 +50,7 @@
16.4 VALUE "FileVersion", SVN_FULL_VERSION
16.5 VALUE "InternalName", "SourceMod GeoIP Extension"
16.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
16.7 - VALUE "OriginalFilename", "geoip.ext.dll"
16.8 + VALUE "OriginalFilename", BINARY_NAME
16.9 VALUE "ProductName", "SourceMod GeoIP Extension"
16.10 VALUE "ProductVersion", SVN_FULL_VERSION
16.11 END
17.1 --- a/extensions/mysql/msvc9/sm_mysql.vcproj Mon Aug 24 09:41:53 2009 +1200
17.2 +++ b/extensions/mysql/msvc9/sm_mysql.vcproj Sun Aug 30 00:03:58 2009 -0700
17.3 @@ -59,6 +59,7 @@
17.4 />
17.5 <Tool
17.6 Name="VCResourceCompilerTool"
17.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
17.8 />
17.9 <Tool
17.10 Name="VCPreLinkEventTool"
17.11 @@ -139,6 +140,7 @@
17.12 />
17.13 <Tool
17.14 Name="VCResourceCompilerTool"
17.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
17.16 />
17.17 <Tool
17.18 Name="VCPreLinkEventTool"
18.1 --- a/extensions/mysql/version.rc Mon Aug 24 09:41:53 2009 +1200
18.2 +++ b/extensions/mysql/version.rc Sun Aug 30 00:03:58 2009 -0700
18.3 @@ -50,7 +50,7 @@
18.4 VALUE "FileVersion", SVN_FULL_VERSION
18.5 VALUE "InternalName", "SourceMod MySQL Extension"
18.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
18.7 - VALUE "OriginalFilename", "dbi.mysql.ext.dll"
18.8 + VALUE "OriginalFilename", BINARY_NAME
18.9 VALUE "ProductName", "SourceMod MySQL Extension"
18.10 VALUE "ProductVersion", SVN_FULL_VERSION
18.11 END
19.1 --- a/extensions/regex/msvc9/regex.vcproj Mon Aug 24 09:41:53 2009 +1200
19.2 +++ b/extensions/regex/msvc9/regex.vcproj Sun Aug 30 00:03:58 2009 -0700
19.3 @@ -58,6 +58,7 @@
19.4 />
19.5 <Tool
19.6 Name="VCResourceCompilerTool"
19.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
19.8 />
19.9 <Tool
19.10 Name="VCPreLinkEventTool"
19.11 @@ -137,6 +138,7 @@
19.12 />
19.13 <Tool
19.14 Name="VCResourceCompilerTool"
19.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
19.16 />
19.17 <Tool
19.18 Name="VCPreLinkEventTool"
20.1 --- a/extensions/regex/version.rc Mon Aug 24 09:41:53 2009 +1200
20.2 +++ b/extensions/regex/version.rc Sun Aug 30 00:03:58 2009 -0700
20.3 @@ -50,7 +50,7 @@
20.4 VALUE "FileVersion", SVN_FULL_VERSION
20.5 VALUE "InternalName", "SourceMod Regular Expression Extension"
20.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
20.7 - VALUE "OriginalFilename", "regex.ext.dll"
20.8 + VALUE "OriginalFilename", BINARY_NAME
20.9 VALUE "ProductName", "SourceMod Regular Expression Extension"
20.10 VALUE "ProductVersion", SVN_FULL_VERSION
20.11 END
21.1 --- a/extensions/sdktools/Makefile Mon Aug 24 09:41:53 2009 +1200
21.2 +++ b/extensions/sdktools/Makefile Sun Aug 30 00:03:58 2009 -0700
21.3 @@ -42,6 +42,7 @@
21.4 METAMOD = $(MMSOURCE17)/core-legacy
21.5 INCLUDE += -I$(HL2SDK)/public/dlls -I$(HL2SDK)/game_shared
21.6 SRCDS = $(SRCDS_BASE)
21.7 + GAMEFIX = 1.ep1
21.8 override ENGSET = true
21.9 endif
21.10 ifeq "$(ENGINE)" "orangebox"
21.11 @@ -52,6 +53,7 @@
21.12 METAMOD = $(MMSOURCE17)/core
21.13 INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
21.14 SRCDS = $(SRCDS_BASE)/orangebox
21.15 + GAMEFIX = 2.ep2
21.16 override ENGSET = true
21.17 endif
21.18 ifeq "$(ENGINE)" "orangeboxvalve"
21.19 @@ -62,6 +64,7 @@
21.20 METAMOD = $(MMSOURCE17)/core
21.21 INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
21.22 SRCDS = $(SRCDS_BASE)/orangebox
21.23 + GAMEFIX = 2.ep2v
21.24 override ENGSET = true
21.25 endif
21.26 ifeq "$(ENGINE)" "left4dead"
21.27 @@ -72,6 +75,7 @@
21.28 METAMOD = $(MMSOURCE17)/core
21.29 INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
21.30 SRCDS = $(SRCDS_BASE)/l4d
21.31 + GAMEFIX = 2.l4d
21.32 override ENGSET = true
21.33 endif
21.34
21.35 @@ -114,10 +118,10 @@
21.36 OS := $(shell uname -s)
21.37 ifeq "$(OS)" "Darwin"
21.38 LINK += -dynamiclib
21.39 - BINARY = $(PROJECT).ext.dylib
21.40 + BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
21.41 else
21.42 LINK += -static-libgcc -shared
21.43 - BINARY = $(PROJECT).ext.so
21.44 + BINARY = $(PROJECT).ext.$(GAMEFIX).so
21.45 endif
21.46
21.47 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
21.48 @@ -126,8 +130,6 @@
21.49 CPPFLAGS += $(CPP_GCC4_FLAGS)
21.50 endif
21.51
21.52 -BINARY = $(PROJECT).ext.so
21.53 -
21.54 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
21.55
21.56 $(BIN_DIR)/%.o: %.cpp
22.1 --- a/extensions/sdktools/msvc9/sdktools.vcproj Mon Aug 24 09:41:53 2009 +1200
22.2 +++ b/extensions/sdktools/msvc9/sdktools.vcproj Sun Aug 30 00:03:58 2009 -0700
22.3 @@ -43,7 +43,7 @@
22.4 AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.5 Optimization="0"
22.6 AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(HL2SDK)\game_shared";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
22.7 - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
22.8 + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
22.9 MinimalRebuild="true"
22.10 BasicRuntimeChecks="3"
22.11 RuntimeLibrary="1"
22.12 @@ -59,6 +59,7 @@
22.13 />
22.14 <Tool
22.15 Name="VCResourceCompilerTool"
22.16 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.17 />
22.18 <Tool
22.19 Name="VCPreLinkEventTool"
22.20 @@ -66,7 +67,7 @@
22.21 <Tool
22.22 Name="VCLinkerTool"
22.23 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
22.24 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.25 + OutputFile="$(OutDir)\sdktools.ext.1.ep1.dll"
22.26 LinkIncremental="2"
22.27 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
22.28 GenerateDebugInformation="true"
22.29 @@ -125,7 +126,7 @@
22.30 AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.31 FavorSizeOrSpeed="1"
22.32 AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(HL2SDK)\game_shared";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
22.33 - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
22.34 + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
22.35 RuntimeLibrary="0"
22.36 EnableEnhancedInstructionSet="0"
22.37 RuntimeTypeInfo="false"
22.38 @@ -139,6 +140,7 @@
22.39 />
22.40 <Tool
22.41 Name="VCResourceCompilerTool"
22.42 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.43 />
22.44 <Tool
22.45 Name="VCPreLinkEventTool"
22.46 @@ -146,7 +148,7 @@
22.47 <Tool
22.48 Name="VCLinkerTool"
22.49 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
22.50 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.51 + OutputFile="$(OutDir)\sdktools.ext.1.ep1.dll"
22.52 LinkIncremental="1"
22.53 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
22.54 GenerateDebugInformation="true"
22.55 @@ -205,7 +207,7 @@
22.56 Name="VCCLCompilerTool"
22.57 AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.58 Optimization="0"
22.59 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(HL2SDKOB)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.60 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.61 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
22.62 MinimalRebuild="true"
22.63 BasicRuntimeChecks="3"
22.64 @@ -222,6 +224,7 @@
22.65 />
22.66 <Tool
22.67 Name="VCResourceCompilerTool"
22.68 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.69 />
22.70 <Tool
22.71 Name="VCPreLinkEventTool"
22.72 @@ -229,7 +232,7 @@
22.73 <Tool
22.74 Name="VCLinkerTool"
22.75 AdditionalDependencies=""$(HL2SDKOB)\lib\public\tier0.lib" "$(HL2SDKOB)\lib\public\tier1.lib" "$(HL2SDKOB)\lib\public\vstdlib.lib" "$(HL2SDKOB)\lib\public\mathlib.lib""
22.76 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.77 + OutputFile="$(OutDir)\sdktools.ext.2.ep2.dll"
22.78 LinkIncremental="2"
22.79 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
22.80 GenerateDebugInformation="true"
22.81 @@ -287,7 +290,7 @@
22.82 Name="VCCLCompilerTool"
22.83 AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.84 FavorSizeOrSpeed="1"
22.85 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(HL2SDKOB)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.86 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.87 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
22.88 RuntimeLibrary="0"
22.89 EnableEnhancedInstructionSet="0"
22.90 @@ -302,6 +305,7 @@
22.91 />
22.92 <Tool
22.93 Name="VCResourceCompilerTool"
22.94 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.95 />
22.96 <Tool
22.97 Name="VCPreLinkEventTool"
22.98 @@ -309,7 +313,7 @@
22.99 <Tool
22.100 Name="VCLinkerTool"
22.101 AdditionalDependencies=""$(HL2SDKOB)\lib\public\tier0.lib" "$(HL2SDKOB)\lib\public\tier1.lib" "$(HL2SDKOB)\lib\public\vstdlib.lib" "$(HL2SDKOB)\lib\public\mathlib.lib""
22.102 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.103 + OutputFile="$(OutDir)\sdktools.ext.2.ep2.dll"
22.104 LinkIncremental="1"
22.105 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
22.106 GenerateDebugInformation="true"
22.107 @@ -368,8 +372,8 @@
22.108 Name="VCCLCompilerTool"
22.109 AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.110 Optimization="0"
22.111 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(HL2SDK)\game_shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.112 - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
22.113 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.114 + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
22.115 MinimalRebuild="true"
22.116 BasicRuntimeChecks="3"
22.117 RuntimeLibrary="1"
22.118 @@ -451,7 +455,7 @@
22.119 AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.120 FavorSizeOrSpeed="1"
22.121 AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(HL2SDK)\game_shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.122 - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
22.123 + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
22.124 RuntimeLibrary="0"
22.125 EnableEnhancedInstructionSet="0"
22.126 RuntimeTypeInfo="false"
22.127 @@ -465,6 +469,7 @@
22.128 />
22.129 <Tool
22.130 Name="VCResourceCompilerTool"
22.131 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.132 />
22.133 <Tool
22.134 Name="VCPreLinkEventTool"
22.135 @@ -472,7 +477,7 @@
22.136 <Tool
22.137 Name="VCLinkerTool"
22.138 AdditionalDependencies=""$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\vstdlib.lib" "$(HL2SDK)\lib\public\mathlib.lib""
22.139 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.140 + OutputFile="$(OutDir)\sdktools.ext.1.ep1.dll"
22.141 LinkIncremental="1"
22.142 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
22.143 GenerateDebugInformation="true"
22.144 @@ -531,8 +536,8 @@
22.145 Name="VCCLCompilerTool"
22.146 AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.147 Optimization="0"
22.148 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(HL2SDKL4D)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.149 - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
22.150 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.151 + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
22.152 MinimalRebuild="true"
22.153 BasicRuntimeChecks="3"
22.154 RuntimeLibrary="1"
22.155 @@ -548,6 +553,7 @@
22.156 />
22.157 <Tool
22.158 Name="VCResourceCompilerTool"
22.159 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.160 />
22.161 <Tool
22.162 Name="VCPreLinkEventTool"
22.163 @@ -555,7 +561,7 @@
22.164 <Tool
22.165 Name="VCLinkerTool"
22.166 AdditionalDependencies=""$(HL2SDKL4D)\lib\public\tier0.lib" "$(HL2SDKL4D)\lib\public\tier1.lib" "$(HL2SDKL4D)\lib\public\vstdlib.lib" "$(HL2SDKL4D)\lib\public\mathlib.lib""
22.167 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.168 + OutputFile="$(OutDir)\sdktools.ext.2.l4d.dll"
22.169 LinkIncremental="2"
22.170 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
22.171 GenerateDebugInformation="true"
22.172 @@ -611,10 +617,10 @@
22.173 />
22.174 <Tool
22.175 Name="VCCLCompilerTool"
22.176 - AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.177 + AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.178 FavorSizeOrSpeed="1"
22.179 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(HL2SDKL4D)\game\shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.180 - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
22.181 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.182 + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
22.183 RuntimeLibrary="0"
22.184 EnableEnhancedInstructionSet="0"
22.185 RuntimeTypeInfo="false"
22.186 @@ -628,6 +634,7 @@
22.187 />
22.188 <Tool
22.189 Name="VCResourceCompilerTool"
22.190 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.191 />
22.192 <Tool
22.193 Name="VCPreLinkEventTool"
22.194 @@ -635,7 +642,7 @@
22.195 <Tool
22.196 Name="VCLinkerTool"
22.197 AdditionalDependencies=""$(HL2SDKL4D)\lib\public\tier0.lib" "$(HL2SDKL4D)\lib\public\tier1.lib" "$(HL2SDKL4D)\lib\public\vstdlib.lib" "$(HL2SDKL4D)\lib\public\mathlib.lib""
22.198 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.199 + OutputFile="$(OutDir)\sdktools.ext.2.l4d.dll"
22.200 LinkIncremental="1"
22.201 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
22.202 GenerateDebugInformation="true"
22.203 @@ -694,7 +701,7 @@
22.204 Name="VCCLCompilerTool"
22.205 AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.206 Optimization="0"
22.207 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\dlls";"$(HL2SDK-DARKM)\public\engine";"$(HL2SDK-DARKM)\public\mathlib";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1";"$(HL2SDK-DARKM\game_shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.208 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\dlls";"$(HL2SDK-DARKM)\public\engine";"$(HL2SDK-DARKM)\public\mathlib";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.209 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
22.210 MinimalRebuild="true"
22.211 BasicRuntimeChecks="3"
22.212 @@ -711,6 +718,7 @@
22.213 />
22.214 <Tool
22.215 Name="VCResourceCompilerTool"
22.216 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.217 />
22.218 <Tool
22.219 Name="VCPreLinkEventTool"
22.220 @@ -718,7 +726,7 @@
22.221 <Tool
22.222 Name="VCLinkerTool"
22.223 AdditionalDependencies=""$(HL2SDK-DARKM)\lib\public\tier0.lib" "$(HL2SDK-DARKM)\lib\public\tier1.lib" "$(HL2SDK-DARKM)\lib\public\vstdlib.lib" "$(HL2SDK-DARKM)\lib\public\mathlib.lib""
22.224 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.225 + OutputFile="$(OutDir)\sdktools.ext.2.darkm.dll"
22.226 LinkIncremental="2"
22.227 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
22.228 GenerateDebugInformation="true"
22.229 @@ -776,7 +784,7 @@
22.230 Name="VCCLCompilerTool"
22.231 AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
22.232 FavorSizeOrSpeed="1"
22.233 - AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\dlls";"$(HL2SDK-DARKM)\public\engine";"$(HL2SDK-DARKM)\public\mathlib";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1";"$(HL2SDK-DARKM)\game_shared";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.234 + AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\dlls";"$(HL2SDK-DARKM)\public\engine";"$(HL2SDK-DARKM)\public\mathlib";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
22.235 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
22.236 RuntimeLibrary="0"
22.237 EnableEnhancedInstructionSet="0"
22.238 @@ -791,6 +799,7 @@
22.239 />
22.240 <Tool
22.241 Name="VCResourceCompilerTool"
22.242 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.243 />
22.244 <Tool
22.245 Name="VCPreLinkEventTool"
22.246 @@ -798,7 +807,7 @@
22.247 <Tool
22.248 Name="VCLinkerTool"
22.249 AdditionalDependencies=""$(HL2SDK-DARKM)\lib\public\tier0.lib" "$(HL2SDK-DARKM)\lib\public\tier1.lib" "$(HL2SDK-DARKM)\lib\public\vstdlib.lib" "$(HL2SDK-DARKM)\lib\public\mathlib.lib""
22.250 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.251 + OutputFile="$(OutDir)\sdktools.ext.2.darkm.dll"
22.252 LinkIncremental="1"
22.253 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
22.254 GenerateDebugInformation="true"
22.255 @@ -874,6 +883,7 @@
22.256 />
22.257 <Tool
22.258 Name="VCResourceCompilerTool"
22.259 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.260 />
22.261 <Tool
22.262 Name="VCPreLinkEventTool"
22.263 @@ -881,7 +891,7 @@
22.264 <Tool
22.265 Name="VCLinkerTool"
22.266 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib""
22.267 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.268 + OutputFile="$(OutDir)\sdktools.ext.2.ep2v.dll"
22.269 LinkIncremental="2"
22.270 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
22.271 GenerateDebugInformation="true"
22.272 @@ -954,6 +964,7 @@
22.273 />
22.274 <Tool
22.275 Name="VCResourceCompilerTool"
22.276 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
22.277 />
22.278 <Tool
22.279 Name="VCPreLinkEventTool"
22.280 @@ -961,7 +972,7 @@
22.281 <Tool
22.282 Name="VCLinkerTool"
22.283 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib" "$(HL2SDKOBVALVE)\lib\public\vstdlib.lib" "$(HL2SDKOBVALVE)\lib\public\mathlib.lib""
22.284 - OutputFile="$(OutDir)\sdktools.ext.dll"
22.285 + OutputFile="$(OutDir)\sdktools.ext.2.ep2v.dll"
22.286 LinkIncremental="1"
22.287 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
22.288 GenerateDebugInformation="true"
23.1 --- a/extensions/sdktools/version.rc Mon Aug 24 09:41:53 2009 +1200
23.2 +++ b/extensions/sdktools/version.rc Sun Aug 30 00:03:58 2009 -0700
23.3 @@ -50,7 +50,7 @@
23.4 VALUE "FileVersion", SVN_FULL_VERSION
23.5 VALUE "InternalName", "SourceMod SDKTools Extension"
23.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
23.7 - VALUE "OriginalFilename", "sdktools.ext.dll"
23.8 + VALUE "OriginalFilename", BINARY_NAME
23.9 VALUE "ProductName", "SourceMod SDKTools Extension"
23.10 VALUE "ProductVersion", SVN_FULL_VERSION
23.11 END
24.1 --- a/extensions/sqlite/msvc9/sm_sqlite.vcproj Mon Aug 24 09:41:53 2009 +1200
24.2 +++ b/extensions/sqlite/msvc9/sm_sqlite.vcproj Sun Aug 30 00:03:58 2009 -0700
24.3 @@ -58,6 +58,7 @@
24.4 />
24.5 <Tool
24.6 Name="VCResourceCompilerTool"
24.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
24.8 />
24.9 <Tool
24.10 Name="VCPreLinkEventTool"
24.11 @@ -136,6 +137,7 @@
24.12 />
24.13 <Tool
24.14 Name="VCResourceCompilerTool"
24.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
24.16 />
24.17 <Tool
24.18 Name="VCPreLinkEventTool"
25.1 --- a/extensions/sqlite/version.rc Mon Aug 24 09:41:53 2009 +1200
25.2 +++ b/extensions/sqlite/version.rc Sun Aug 30 00:03:58 2009 -0700
25.3 @@ -50,7 +50,7 @@
25.4 VALUE "FileVersion", SVN_FULL_VERSION
25.5 VALUE "InternalName", "SourceMod SQLite Extension"
25.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
25.7 - VALUE "OriginalFilename", "dbi.sqlite.ext.dll"
25.8 + VALUE "OriginalFilename", BINARY_NAME
25.9 VALUE "ProductName", "SourceMod SQLite Extension"
25.10 VALUE "ProductVersion", SVN_FULL_VERSION
25.11 END
26.1 --- a/extensions/tf2/Makefile Mon Aug 24 09:41:53 2009 +1200
26.2 +++ b/extensions/tf2/Makefile Sun Aug 30 00:03:58 2009 -0700
26.3 @@ -40,6 +40,7 @@
26.4 METAMOD = $(MMSOURCE17)/core-legacy
26.5 INCLUDE += -I$(HL2SDK)/public/dlls
26.6 SRCDS = $(SRCDS_BASE)
26.7 + GAMEFIX = 1.ep1
26.8 override ENGSET = true
26.9 endif
26.10 ifeq "$(ENGINE)" "orangebox"
26.11 @@ -50,6 +51,7 @@
26.12 METAMOD = $(MMSOURCE17)/core
26.13 INCLUDE += -I$(HL2SDK)/public/game/server
26.14 SRCDS = $(SRCDS_BASE)/orangebox
26.15 + GAMEFIX = 2.ep2
26.16 override ENGSET = true
26.17 endif
26.18 ifeq "$(ENGINE)" "orangeboxvalve"
26.19 @@ -60,6 +62,7 @@
26.20 METAMOD = $(MMSOURCE17)/core
26.21 INCLUDE += -I$(HL2SDK)/public/game/server
26.22 SRCDS = $(SRCDS_BASE)/orangebox
26.23 + GAMEFIX = 2.ep2v
26.24 override ENGSET = true
26.25 endif
26.26 ifeq "$(ENGINE)" "left4dead"
26.27 @@ -70,6 +73,7 @@
26.28 METAMOD = $(MMSOURCE17)/core
26.29 INCLUDE += -I$(HL2SDK)/public/game/server
26.30 SRCDS = $(SRCDS_BASE)/l4d
26.31 + GAMEFIX = 2.l4d
26.32 override ENGSET = true
26.33 endif
26.34
26.35 @@ -112,10 +116,10 @@
26.36 OS := $(shell uname -s)
26.37 ifeq "$(OS)" "Darwin"
26.38 LINK += -dynamiclib
26.39 - BINARY = $(PROJECT).ext.dylib
26.40 + BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
26.41 else
26.42 LINK += -static-libgcc -shared
26.43 - BINARY = $(PROJECT).ext.so
26.44 + BINARY = $(PROJECT).ext.$(GAMEFIX).so
26.45 endif
26.46
26.47 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
27.1 --- a/extensions/tf2/msvc9/tf2.vcproj Mon Aug 24 09:41:53 2009 +1200
27.2 +++ b/extensions/tf2/msvc9/tf2.vcproj Sun Aug 30 00:03:58 2009 -0700
27.3 @@ -58,6 +58,7 @@
27.4 />
27.5 <Tool
27.6 Name="VCResourceCompilerTool"
27.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
27.8 />
27.9 <Tool
27.10 Name="VCPreLinkEventTool"
27.11 @@ -65,7 +66,7 @@
27.12 <Tool
27.13 Name="VCLinkerTool"
27.14 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib""
27.15 - OutputFile="$(OutDir)\game.tf2.ext.dll"
27.16 + OutputFile="$(OutDir)\game.tf2.ext.2.ep2v.dll"
27.17 LinkIncremental="2"
27.18 GenerateDebugInformation="true"
27.19 SubSystem="2"
27.20 @@ -136,6 +137,7 @@
27.21 />
27.22 <Tool
27.23 Name="VCResourceCompilerTool"
27.24 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
27.25 />
27.26 <Tool
27.27 Name="VCPreLinkEventTool"
27.28 @@ -143,7 +145,7 @@
27.29 <Tool
27.30 Name="VCLinkerTool"
27.31 AdditionalDependencies=""$(HL2SDKOBVALVE)\lib\public\tier0.lib" "$(HL2SDKOBVALVE)\lib\public\tier1.lib""
27.32 - OutputFile="$(OutDir)\game.tf2.ext.dll"
27.33 + OutputFile="$(OutDir)\game.tf2.ext.2.ep2v.dll"
27.34 LinkIncremental="1"
27.35 GenerateDebugInformation="true"
27.36 SubSystem="2"
28.1 --- a/extensions/tf2/version.rc Mon Aug 24 09:41:53 2009 +1200
28.2 +++ b/extensions/tf2/version.rc Sun Aug 30 00:03:58 2009 -0700
28.3 @@ -50,7 +50,7 @@
28.4 VALUE "FileVersion", SVN_FULL_VERSION
28.5 VALUE "InternalName", "SourceMod TF2 Extension"
28.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
28.7 - VALUE "OriginalFilename", "game.tf2.ext.dll"
28.8 + VALUE "OriginalFilename", BINARY_NAME
28.9 VALUE "ProductName", "SourceMod TF2 Extension"
28.10 VALUE "ProductVersion", SVN_FULL_VERSION
28.11 END
29.1 --- a/extensions/topmenus/msvc9/topmenus.vcproj Mon Aug 24 09:41:53 2009 +1200
29.2 +++ b/extensions/topmenus/msvc9/topmenus.vcproj Sun Aug 30 00:03:58 2009 -0700
29.3 @@ -57,6 +57,7 @@
29.4 />
29.5 <Tool
29.6 Name="VCResourceCompilerTool"
29.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
29.8 />
29.9 <Tool
29.10 Name="VCPreLinkEventTool"
29.11 @@ -133,6 +134,7 @@
29.12 />
29.13 <Tool
29.14 Name="VCResourceCompilerTool"
29.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
29.16 />
29.17 <Tool
29.18 Name="VCPreLinkEventTool"
30.1 --- a/extensions/topmenus/version.rc Mon Aug 24 09:41:53 2009 +1200
30.2 +++ b/extensions/topmenus/version.rc Sun Aug 30 00:03:58 2009 -0700
30.3 @@ -50,7 +50,7 @@
30.4 VALUE "FileVersion", SVN_FULL_VERSION
30.5 VALUE "InternalName", "SourceMod TopMenus Extension"
30.6 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
30.7 - VALUE "OriginalFilename", "topmenus.ext.dll"
30.8 + VALUE "OriginalFilename", BINARY_NAME
30.9 VALUE "ProductName", "SourceMod TopMenus Extension"
30.10 VALUE "ProductVersion", SVN_FULL_VERSION
30.11 END
31.1 --- a/extensions/updater/msvc9/updater.vcproj Mon Aug 24 09:41:53 2009 +1200
31.2 +++ b/extensions/updater/msvc9/updater.vcproj Sun Aug 30 00:03:58 2009 -0700
31.3 @@ -58,6 +58,7 @@
31.4 />
31.5 <Tool
31.6 Name="VCResourceCompilerTool"
31.7 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.8 />
31.9 <Tool
31.10 Name="VCPreLinkEventTool"
31.11 @@ -136,6 +137,7 @@
31.12 />
31.13 <Tool
31.14 Name="VCResourceCompilerTool"
31.15 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.16 />
31.17 <Tool
31.18 Name="VCPreLinkEventTool"
31.19 @@ -218,6 +220,7 @@
31.20 />
31.21 <Tool
31.22 Name="VCResourceCompilerTool"
31.23 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.24 />
31.25 <Tool
31.26 Name="VCPreLinkEventTool"
31.27 @@ -298,6 +301,7 @@
31.28 />
31.29 <Tool
31.30 Name="VCResourceCompilerTool"
31.31 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.32 />
31.33 <Tool
31.34 Name="VCPreLinkEventTool"
31.35 @@ -381,6 +385,7 @@
31.36 />
31.37 <Tool
31.38 Name="VCResourceCompilerTool"
31.39 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.40 />
31.41 <Tool
31.42 Name="VCPreLinkEventTool"
31.43 @@ -461,6 +466,7 @@
31.44 />
31.45 <Tool
31.46 Name="VCResourceCompilerTool"
31.47 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.48 />
31.49 <Tool
31.50 Name="VCPreLinkEventTool"
31.51 @@ -544,6 +550,7 @@
31.52 />
31.53 <Tool
31.54 Name="VCResourceCompilerTool"
31.55 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.56 />
31.57 <Tool
31.58 Name="VCPreLinkEventTool"
31.59 @@ -624,6 +631,7 @@
31.60 />
31.61 <Tool
31.62 Name="VCResourceCompilerTool"
31.63 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.64 />
31.65 <Tool
31.66 Name="VCPreLinkEventTool"
31.67 @@ -707,6 +715,7 @@
31.68 />
31.69 <Tool
31.70 Name="VCResourceCompilerTool"
31.71 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.72 />
31.73 <Tool
31.74 Name="VCPreLinkEventTool"
31.75 @@ -787,6 +796,7 @@
31.76 />
31.77 <Tool
31.78 Name="VCResourceCompilerTool"
31.79 + PreprocessorDefinitions="BINARY_NAME=\"$(TargetFileName)\""
31.80 />
31.81 <Tool
31.82 Name="VCPreLinkEventTool"
32.1 --- a/extensions/updater/version.rc Mon Aug 24 09:41:53 2009 +1200
32.2 +++ b/extensions/updater/version.rc Sun Aug 30 00:03:58 2009 -0700
32.3 @@ -50,7 +50,7 @@
32.4 VALUE "FileVersion", SVN_FILE_VERSION
32.5 VALUE "InternalName", "SourceMod Updater Extension"
32.6 VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
32.7 - VALUE "OriginalFilename", "updater.ext.dll"
32.8 + VALUE "OriginalFilename", BINARY_NAME
32.9 VALUE "ProductName", "SourceMod Updater Extension"
32.10 VALUE "ProductVersion", SVN_FULL_VERSION
32.11 END
33.1 --- a/loader/loader.cpp Mon Aug 24 09:41:53 2009 +1200
33.2 +++ b/loader/loader.cpp Sun Aug 30 00:03:58 2009 -0700
33.3 @@ -70,7 +70,7 @@
33.4 #define METAMOD_API_MAJOR 2
33.5 #define FILENAME_1_4_EP1 "sourcemod.1.ep1" PLATFORM_EXT
33.6 #define FILENAME_1_6_EP2 "sourcemod.2.ep2" PLATFORM_EXT
33.7 -#define FILENAME_1_6_EP2VALVE "sourcemod.2.ep2valve" PLATFORM_EXT
33.8 +#define FILENAME_1_6_EP2VALVE "sourcemod.2.ep2v" PLATFORM_EXT
33.9 #define FILENAME_1_6_EP1 "sourcemod.2.ep1" PLATFORM_EXT
33.10 #define FILENAME_1_6_L4D "sourcemod.2.l4d" PLATFORM_EXT
33.11 #define FILENAME_1_6_DARKM "sourcemod.2.darkm" PLATFORM_EXT
34.1 --- a/public/mms_sample_ext/Makefile Mon Aug 24 09:41:53 2009 +1200
34.2 +++ b/public/mms_sample_ext/Makefile Sun Aug 30 00:03:58 2009 -0700
34.3 @@ -5,6 +5,7 @@
34.4 SRCDS_BASE = ~/srcds
34.5 HL2SDK_ORIG = ../../../hl2sdk
34.6 HL2SDK_OB = ../../../hl2sdk-ob
34.7 +HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
34.8 HL2SDK_L4D = ../../../hl2sdk-l4d
34.9 MMSOURCE17 = ../../../mmsource-1.7
34.10
34.11 @@ -47,18 +48,28 @@
34.12 SRCDS = $(SRCDS_BASE)/orangebox
34.13 override ENGSET = true
34.14 endif
34.15 +ifeq "$(ENGINE)" "orangeboxvalve"
34.16 + HL2SDK = $(HL2SDK_OB_VALVE)
34.17 + HL2PUB = $(HL2SDK)/public
34.18 + HL2LIB = $(HL2SDK)/lib/linux
34.19 + CFLAGS += -DSOURCE_ENGINE=4
34.20 + METAMOD = $(MMSOURCE17)/core
34.21 + INCLUDE += -I$(HL2SDK)/public/game/server
34.22 + SRCDS = $(SRCDS_BASE)/orangebox
34.23 + override ENGSET = true
34.24 +endif
34.25 ifeq "$(ENGINE)" "left4dead"
34.26 HL2SDK = $(HL2SDK_L4D)
34.27 HL2PUB = $(HL2SDK)/public
34.28 HL2LIB = $(HL2SDK)/lib/linux
34.29 - CFLAGS += -DSOURCE_ENGINE=4
34.30 + CFLAGS += -DSOURCE_ENGINE=5
34.31 METAMOD = $(MMSOURCE17)/core
34.32 INCLUDE += -I$(HL2SDK)/public/game/server
34.33 SRCDS = $(SRCDS_BASE)/l4d
34.34 override ENGSET = true
34.35 endif
34.36
34.37 -CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
34.38 +CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
34.39
34.40 LINK = vstdlib_i486.so tier0_i486.so -m32 -ldl -lm
34.41
35.1 --- a/public/sample_ext/Makefile Mon Aug 24 09:41:53 2009 +1200
35.2 +++ b/public/sample_ext/Makefile Sun Aug 30 00:03:58 2009 -0700
35.3 @@ -5,6 +5,7 @@
35.4 SRCDS_BASE = ~/srcds
35.5 HL2SDK_ORIG = ../../../hl2sdk
35.6 HL2SDK_OB = ../../../hl2sdk-ob
35.7 +HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
35.8 HL2SDK_L4D = ../../../hl2sdk-l4d
35.9 MMSOURCE17 = ../../../mmsource-1.7
35.10
35.11 @@ -50,11 +51,21 @@
35.12 SRCDS = $(SRCDS_BASE)/orangebox
35.13 override ENGSET = true
35.14 endif
35.15 +ifeq "$(ENGINE)" "orangeboxvalve"
35.16 + HL2SDK = $(HL2SDK_OB_VALVE)
35.17 + HL2PUB = $(HL2SDK)/public
35.18 + HL2LIB = $(HL2SDK)/lib/linux
35.19 + CFLAGS += -DSOURCE_ENGINE=4
35.20 + METAMOD = $(MMSOURCE17)/core
35.21 + INCLUDE += -I$(HL2SDK)/public/game/server
35.22 + SRCDS = $(SRCDS_BASE)/orangebox
35.23 + override ENGSET = true
35.24 +endif
35.25 ifeq "$(ENGINE)" "left4dead"
35.26 HL2SDK = $(HL2SDK_L4D)
35.27 HL2PUB = $(HL2SDK)/public
35.28 HL2LIB = $(HL2SDK)/lib/linux
35.29 - CFLAGS += -DSOURCE_ENGINE=4
35.30 + CFLAGS += -DSOURCE_ENGINE=5
35.31 METAMOD = $(MMSOURCE17)/core
35.32 INCLUDE += -I$(HL2SDK)/public/game/server
35.33 SRCDS = $(SRCDS_BASE)/l4d
35.34 @@ -68,7 +79,7 @@
35.35
35.36 INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
35.37 -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
35.38 - CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
35.39 + CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
35.40 else
35.41 INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
35.42 endif
