1.1 --- a/core/ExtensionSys.cpp Mon Aug 17 10:03:53 2009 +1200
1.2 +++ b/core/ExtensionSys.cpp Mon Aug 17 10:42:01 2009 +1200
1.3 @@ -74,7 +74,7 @@
1.4 #elif SOURCE_ENGINE == SE_ORANGEBOX
1.5 "extensions/auto.2.ep2/%s",
1.6 #elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
1.7 - "extensions/auto.2.ep2valve",
1.8 + "extensions/auto.2.ep2valve/%s",
1.9 #elif SOURCE_ENGINE == SE_DARKMESSIAH
1.10 "extensions/auto.2.darkm/%s",
1.11 #else
2.1 --- a/extensions/bintools/Makefile Mon Aug 17 10:03:53 2009 +1200
2.2 +++ b/extensions/bintools/Makefile Mon Aug 17 10:42:01 2009 +1200
2.3 @@ -37,6 +37,8 @@
2.4 INCLUDE += -I$(MMSOURCE17)/core -I$(MMSOURCE17)/core/sourcehook
2.5 SRCDS = $(SRCDS_BASE)
2.6 override ENGSET = true
2.7 + USEMETA = true
2.8 + CFLAGS += -DHOOKING_ENABLED
2.9 endif
2.10 ifeq "$(ENGINE)" "orangebox"
2.11 HL2SDK = $(HL2SDK_OB)
3.1 --- a/extensions/bintools/msvc9/bintools.vcproj Mon Aug 17 10:03:53 2009 +1200
3.2 +++ b/extensions/bintools/msvc9/bintools.vcproj Mon Aug 17 10:42:01 2009 +1200
3.3 @@ -992,6 +992,10 @@
3.4 UniqueIdentifier="{C06F7BFF-18EE-4994-8572-D6383011354B}"
3.5 >
3.6 <File
3.7 + RelativePath="..\..\..\public\extensions\IBinTools.h"
3.8 + >
3.9 + </File>
3.10 + <File
3.11 RelativePath="..\version.rc"
3.12 >
3.13 </File>
3.14 @@ -1070,10 +1074,6 @@
3.15 Name="Interfaces"
3.16 UniqueIdentifier="{7DE81EA3-99D9-4f34-823A-B314791F3514}"
3.17 >
3.18 - <File
3.19 - RelativePath="..\..\..\public\extensions\IBinTools.h"
3.20 - >
3.21 - </File>
3.22 </Filter>
3.23 </Files>
3.24 <Globals>
4.1 --- a/loader/loader.cpp Mon Aug 17 10:03:53 2009 +1200
4.2 +++ b/loader/loader.cpp Mon Aug 17 10:42:01 2009 +1200
4.3 @@ -48,6 +48,8 @@
4.4 return (c == '/' || c == '\\');
4.5 }
4.6 #include <Windows.h>
4.7 + #define TF_PATH "\\tf\\"
4.8 + #define DOD_PATH "\\dod\\"
4.9 #else
4.10 #define DLL_EXPORT extern "C" __attribute__((visibility("default")))
4.11 #define openlib(lib) dlopen(lib, RTLD_NOW)
4.12 @@ -61,6 +63,8 @@
4.13 return (c == '/');
4.14 }
4.15 #include <dlfcn.h>
4.16 + #define TF_PATH "/tf/"
4.17 + #define DOD_PATH "/dod/"
4.18 #endif
4.19
4.20 #define METAMOD_API_MAJOR 2
4.21 @@ -213,7 +217,7 @@
4.22 }
4.23 case SOURCE_ENGINE_ORANGEBOX:
4.24 {
4.25 - if (strncmp(mli->pl_path, "tf/", 3) == 0)
4.26 + if (strstr(mli->pl_path, TF_PATH) || strstr(mli->pl_path, DOD_PATH))
4.27 {
4.28 filename = FILENAME_1_6_EP2VALVE;
4.29 break;
5.1 --- a/tools/builder/LinuxBuilder.cs Mon Aug 17 10:03:53 2009 +1200
5.2 +++ b/tools/builder/LinuxBuilder.cs Mon Aug 17 10:42:01 2009 +1200
5.3 @@ -49,6 +49,10 @@
5.4 {
5.5 output_folder += ".orangeboxvalve";
5.6 }
5.7 + else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
5.8 + {
5.9 + output_folder += ".orangeboxvalve";
5.10 + }
5.11 else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
5.12 {
5.13 output_folder += ".original";
5.14 @@ -81,6 +85,10 @@
5.15 {
5.16 makefile_args += "ENGINE=\"orangeboxvalve\" ";
5.17 }
5.18 + else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
5.19 + {
5.20 + makefile_args += "ENGINE=\"orangeboxvalve\" ";
5.21 + }
5.22 else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
5.23 {
5.24 makefile_args += "ENGINE=\"original\"";
6.1 --- a/tools/builder/PkgCore.cs Mon Aug 17 10:03:53 2009 +1200
6.2 +++ b/tools/builder/PkgCore.cs Mon Aug 17 10:42:01 2009 +1200
6.3 @@ -69,6 +69,7 @@
6.4 folders.Add("addons/sourcemod/extensions/auto.2.darkm");
6.5 //folders.Add("addons/sourcemod/extensions/auto.2.ep1");
6.6 folders.Add("addons/sourcemod/extensions/auto.2.ep2");
6.7 + folders.Add("addons/sourcemod/extensions/auto.2.ep2valve");
6.8 folders.Add("addons/sourcemod/extensions/auto.2.l4d");
6.9 folders.Add("addons/sourcemod/scripting/playercommands");
6.10 folders.Add("addons/metamod");
6.11 @@ -195,6 +196,14 @@
6.12 lib = new Library();
6.13 lib.package_path = "addons/sourcemod/bin";
6.14 lib.source_path = "core";
6.15 + lib.binary_name = "sourcemod.2.ep2valve";
6.16 + lib.vcproj_name = "sourcemod_mm";
6.17 + lib.build_mode = BuildMode.BuildMode_Episode2Valve;
6.18 + libraries.Add(lib);
6.19 +
6.20 + lib = new Library();
6.21 + lib.package_path = "addons/sourcemod/bin";
6.22 + lib.source_path = "core";
6.23 lib.binary_name = "sourcemod.2.l4d";
6.24 lib.vcproj_name = "sourcemod_mm";
6.25 lib.build_mode = BuildMode.BuildMode_Left4Dead;
6.26 @@ -229,14 +238,14 @@
6.27 lib.build_mode = BuildMode.BuildMode_OldMetamod;
6.28 libraries.Add(lib);
6.29
6.30 - lib = new Library();
6.31 - lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
6.32 - lib.source_path = "extensions/bintools";
6.33 - lib.binary_name = "bintools.ext";
6.34 - lib.vcproj_name = "bintools";
6.35 - lib.build_mode = BuildMode.BuildMode_DarkMessiah;
6.36 + lib = new Library();
6.37 + lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
6.38 + lib.source_path = "extensions/bintools";
6.39 + lib.binary_name = "bintools.ext";
6.40 + lib.vcproj_name = "bintools";
6.41 + lib.build_mode = BuildMode.BuildMode_DarkMessiah;
6.42 lib.platform = BasePlatform.Platform_Windows;
6.43 - libraries.Add(lib);
6.44 + libraries.Add(lib);
6.45
6.46 lib = new Library();
6.47 lib.package_path = "addons/sourcemod/extensions/auto.2.ep2";
6.48 @@ -255,6 +264,14 @@
6.49 libraries.Add(lib);
6.50
6.51 lib = new Library();
6.52 + lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
6.53 + lib.source_path = "extensions/bintools";
6.54 + lib.binary_name = "bintools.ext";
6.55 + lib.vcproj_name = "bintools";
6.56 + lib.build_mode = BuildMode.BuildMode_Episode2Valve;
6.57 + libraries.Add(lib);
6.58 +
6.59 + lib = new Library();
6.60 lib.package_path = "addons/sourcemod/extensions/auto.2.l4d";
6.61 lib.source_path = "extensions/bintools";
6.62 lib.binary_name = "bintools.ext";
6.63 @@ -277,14 +294,14 @@
6.64 lib.build_mode = BuildMode.BuildMode_OldMetamod;
6.65 libraries.Add(lib);
6.66
6.67 - lib = new Library();
6.68 - lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
6.69 - lib.source_path = "extensions/sdktools";
6.70 - lib.binary_name = "sdktools.ext";
6.71 - lib.vcproj_name = "sdktools";
6.72 - lib.build_mode = BuildMode.BuildMode_DarkMessiah;
6.73 + lib = new Library();
6.74 + lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
6.75 + lib.source_path = "extensions/sdktools";
6.76 + lib.binary_name = "sdktools.ext";
6.77 + lib.vcproj_name = "sdktools";
6.78 + lib.build_mode = BuildMode.BuildMode_DarkMessiah;
6.79 lib.platform = BasePlatform.Platform_Windows;
6.80 - libraries.Add(lib);
6.81 + libraries.Add(lib);
6.82
6.83 lib = new Library();
6.84 lib.package_path = "addons/sourcemod/extensions/auto.2.ep2";
6.85 @@ -303,6 +320,14 @@
6.86 libraries.Add(lib);
6.87
6.88 lib = new Library();
6.89 + lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
6.90 + lib.source_path = "extensions/sdktools";
6.91 + lib.binary_name = "sdktools.ext";
6.92 + lib.vcproj_name = "sdktools";
6.93 + lib.build_mode = BuildMode.BuildMode_Episode2Valve;
6.94 + libraries.Add(lib);
6.95 +
6.96 + lib = new Library();
6.97 lib.package_path = "addons/sourcemod/extensions/auto.2.l4d";
6.98 lib.source_path = "extensions/sdktools";
6.99 lib.binary_name = "sdktools.ext";
7.1 --- a/tools/builder/Win32Builder.cs Mon Aug 17 10:03:53 2009 +1200
7.2 +++ b/tools/builder/Win32Builder.cs Mon Aug 17 10:42:01 2009 +1200
7.3 @@ -54,6 +54,10 @@
7.4 {
7.5 config_name = config_name + " - Orange Box Valve";
7.6 }
7.7 + else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
7.8 + {
7.9 + config_name = config_name + " - Orange Box Valve";
7.10 + }
7.11 else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
7.12 {
7.13 config_name = config_name + " - Old Metamod";
