From c974176f6dd6e307cb1ed816fa4803574a548f21 Mon Sep 17 00:00:00 2001 From: Fincer Date: Wed, 16 Nov 2016 14:44:52 +0200 Subject: [PATCH] Add RA2 patches --- data/patches/linux/linux-ra2-common.patch | 33 +++++++++++++++ data/patches/linux/linux-ra2-make.patch | 49 +++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 data/patches/linux/linux-ra2-common.patch create mode 100644 data/patches/linux/linux-ra2-make.patch diff --git a/data/patches/linux/linux-ra2-common.patch b/data/patches/linux/linux-ra2-common.patch new file mode 100644 index 0000000..f4791cf --- /dev/null +++ b/data/patches/linux/linux-ra2-common.patch @@ -0,0 +1,33 @@ +--- a/mods/all/mod.yaml ++++ b/mods/all/mod.yaml +@@ -20,6 +20,7 @@ + ./mods/d2k/OpenRA.Mods.D2k.dll + ./mods/cnc/OpenRA.Mods.Cnc.dll + ./mods/ts/OpenRA.Mods.TS.dll ++ ./mods/ra2/OpenRA.Mods.RA2.dll + + ChromeLayout: + + +--- a/mods/ra2/mod.yaml ++++ b/mods/ra2/mod.yaml +@@ -5,7 +5,7 @@ + Author: RA2 team + + RequiresMods: +- modchooser: {DEV_VERSION} ++ + + Packages: + ~^Content/ra2 + +--- a/utility.cmd ++++ b/utility.cmd +@@ -16,6 +16,7 @@ + if /I "%mod%" EQU "ra" (goto help) + if /I "%mod%" EQU "cnc" (goto help) + if /I "%mod%" EQU "ts" (goto help) ++if /I "%mod%" EQU "ra2" (goto help) + if /I "%mod%" EQU "d2k" (goto help) + echo. + echo Unknown mod: %mod% diff --git a/data/patches/linux/linux-ra2-make.patch b/data/patches/linux/linux-ra2-make.patch new file mode 100644 index 0000000..0d31ada --- /dev/null +++ b/data/patches/linux/linux-ra2-make.patch @@ -0,0 +1,49 @@ +--- a/Makefile ++++ b/Makefile +@@ -182,6 +182,15 @@ + PROGRAMS += mod_ts + mod_ts: $(mod_ts_TARGET) + ++# Red Alert 2 ++mod_ra2_SRCS := $(shell find OpenRA.Mods.RA2/ -iname '*.cs') ++mod_ra2_TARGET = mods/ra2/OpenRA.Mods.RA2.dll ++mod_ra2_KIND = library ++mod_ra2_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) ++mod_ra2_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) ++PROGRAMS += mod_ra2 ++mod_ra2: $(mod_ra2_TARGET) ++ + check-scripts: + @echo + @echo "Checking for Lua syntax errors..." +@@ -217,6 +226,9 @@ + @echo "Checking for code style violations in OpenRA.Mods.TS..." + @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS + @echo ++ @echo "Checking for code style violations in OpenRA.Mods.RA2..." ++ @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA2 ++ @echo + @echo "Checking for code style violations in OpenRA.Utility..." + @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility + @echo +@@ -258,6 +270,9 @@ + @echo + @echo "Testing Red Alert mod MiniYAML..." + @mono --debug OpenRA.Utility.exe ra --check-yaml ++ @echo ++ @echo "Testing Red Alert 2 mod MiniYAML..." ++ @mono --debug OpenRA.Utility.exe ra2 --check-yaml + + + ##### Launchers / Utilities ##### +@@ -394,6 +409,10 @@ + @$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/" + @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" + @$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/" ++ @$(CP_R) mods/ts "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_ts_TARGET) "$(DATA_INSTALL_DIR)/mods/ts" ++ @$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2" + + @$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat" + @$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"