Merged the build fixes (hopefully)

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
+8
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\"";
+39 -14
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
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";