UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged the build fixes (hopefully)

Browse Source
This commit is contained in:
Matt Woodrow 2009-08-17 10:42:01 +12:00
parent c307c692a0
commit 13b9deb5ef
7 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ExtensionSys.cpp
View File

@ -74,7 +74,7 @@ CLocalExtension::CLocalExtension(const char *filename)
#elif SOURCE_ENGINE == SE_ORANGEBOX
"extensions/auto.2.ep2/%s",
#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
"extensions/auto.2.ep2valve",
"extensions/auto.2.ep2valve/%s",
#elif SOURCE_ENGINE == SE_DARKMESSIAH
"extensions/auto.2.darkm/%s",
#else

2
extensions/bintools/Makefile
View File

@ -37,6 +37,8 @@ ifeq "$(ENGINE)" "original"
INCLUDE += -I$(MMSOURCE17)/core -I$(MMSOURCE17)/core/sourcehook
SRCDS = $(SRCDS_BASE)
override ENGSET = true
USEMETA = true
CFLAGS += -DHOOKING_ENABLED
endif
ifeq "$(ENGINE)" "orangebox"
HL2SDK = $(HL2SDK_OB)

8
extensions/bintools/msvc9/bintools.vcproj
View File

@ -991,6 +991,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{C06F7BFF-18EE-4994-8572-D6383011354B}"
>
<File
RelativePath="..\..\..\public\extensions\IBinTools.h"
>
</File>
<File
RelativePath="..\version.rc"
>
@ -1070,10 +1074,6 @@
Name="Interfaces"
UniqueIdentifier="{7DE81EA3-99D9-4f34-823A-B314791F3514}"
>
<File
RelativePath="..\..\..\public\extensions\IBinTools.h"
>
</File>
</Filter>
</Files>
<Globals>

6
loader/loader.cpp
View File

@ -48,6 +48,8 @@
return (c == '/' || c == '\\');
}
#include <Windows.h>
#define TF_PATH "\\tf\\"
#define DOD_PATH "\\dod\\"
#else
#define DLL_EXPORT extern "C" __attribute__((visibility("default")))
#define openlib(lib) dlopen(lib, RTLD_NOW)
@ -61,6 +63,8 @@
return (c == '/');
}
#include <dlfcn.h>
#define TF_PATH "/tf/"
#define DOD_PATH "/dod/"
#endif
#define METAMOD_API_MAJOR 2
@ -213,7 +217,7 @@ DLL_EXPORT METAMOD_PLUGIN *CreateInterface_MMS(const MetamodVersionInfo *mvi, co
}
case SOURCE_ENGINE_ORANGEBOX:
{
if (strncmp(mli->pl_path, "tf/", 3) == 0)
if (strstr(mli->pl_path, TF_PATH) || strstr(mli->pl_path, DOD_PATH))
{
filename = FILENAME_1_6_EP2VALVE;
break;

8
tools/builder/LinuxBuilder.cs
View File

@ -49,6 +49,10 @@ namespace builder
{
output_folder += ".orangeboxvalve";
}
else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
{
output_folder += ".orangeboxvalve";
}
else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
{
output_folder += ".original";
@ -81,6 +85,10 @@ namespace builder
{
makefile_args += "ENGINE=\"orangeboxvalve\" ";
}
else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
{
makefile_args += "ENGINE=\"orangeboxvalve\" ";
}
else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
{
makefile_args += "ENGINE=\"original\"";

53
tools/builder/PkgCore.cs
View File

@ -69,6 +69,7 @@ namespace builder
folders.Add("addons/sourcemod/extensions/auto.2.darkm");
//folders.Add("addons/sourcemod/extensions/auto.2.ep1");
folders.Add("addons/sourcemod/extensions/auto.2.ep2");
folders.Add("addons/sourcemod/extensions/auto.2.ep2valve");
folders.Add("addons/sourcemod/extensions/auto.2.l4d");
folders.Add("addons/sourcemod/scripting/playercommands");
folders.Add("addons/metamod");
@ -192,6 +193,14 @@ namespace builder
lib.build_mode = BuildMode.BuildMode_Episode2Valve;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/bin";
lib.source_path = "core";
lib.binary_name = "sourcemod.2.ep2valve";
lib.vcproj_name = "sourcemod_mm";
lib.build_mode = BuildMode.BuildMode_Episode2Valve;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/bin";
lib.source_path = "core";
@ -229,14 +238,14 @@ namespace builder
lib.build_mode = BuildMode.BuildMode_OldMetamod;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
lib.source_path = "extensions/bintools";
lib.binary_name = "bintools.ext";
lib.vcproj_name = "bintools";
lib.build_mode = BuildMode.BuildMode_DarkMessiah;
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
lib.source_path = "extensions/bintools";
lib.binary_name = "bintools.ext";
lib.vcproj_name = "bintools";
lib.build_mode = BuildMode.BuildMode_DarkMessiah;
lib.platform = BasePlatform.Platform_Windows;
libraries.Add(lib);
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.ep2";
@ -254,6 +263,14 @@ namespace builder
lib.build_mode = BuildMode.BuildMode_Episode2Valve;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
lib.source_path = "extensions/bintools";
lib.binary_name = "bintools.ext";
lib.vcproj_name = "bintools";
lib.build_mode = BuildMode.BuildMode_Episode2Valve;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.l4d";
lib.source_path = "extensions/bintools";
@ -277,14 +294,14 @@ namespace builder
lib.build_mode = BuildMode.BuildMode_OldMetamod;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
lib.source_path = "extensions/sdktools";
lib.binary_name = "sdktools.ext";
lib.vcproj_name = "sdktools";
lib.build_mode = BuildMode.BuildMode_DarkMessiah;
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.darkm";
lib.source_path = "extensions/sdktools";
lib.binary_name = "sdktools.ext";
lib.vcproj_name = "sdktools";
lib.build_mode = BuildMode.BuildMode_DarkMessiah;
lib.platform = BasePlatform.Platform_Windows;
libraries.Add(lib);
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.ep2";
@ -302,6 +319,14 @@ namespace builder
lib.build_mode = BuildMode.BuildMode_Episode2Valve;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
lib.source_path = "extensions/sdktools";
lib.binary_name = "sdktools.ext";
lib.vcproj_name = "sdktools";
lib.build_mode = BuildMode.BuildMode_Episode2Valve;
libraries.Add(lib);
lib = new Library();
lib.package_path = "addons/sourcemod/extensions/auto.2.l4d";
lib.source_path = "extensions/sdktools";

4
tools/builder/Win32Builder.cs
View File

@ -54,6 +54,10 @@ namespace builder
{
config_name = config_name + " - Orange Box Valve";
}
else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
{
config_name = config_name + " - Orange Box Valve";
}
else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
{
config_name = config_name + " - Old Metamod";