|
|
--- a/Makefile
|
|
|
+++ b/Makefile
|
|
|
@@ -187,6 +187,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..."
|
|
|
@@ -222,6 +231,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
|
|
|
@@ -255,6 +267,9 @@
|
|
|
@echo "Testing Tiberian Sun mod MiniYAML..."
|
|
|
@mono --debug OpenRA.Utility.exe ts --check-yaml
|
|
|
@echo
|
|
|
+ @echo "Testing Red Alert 2 mod MiniYAML..."
|
|
|
+ @mono --debug OpenRA.Utility.exe ra2 --check-yaml
|
|
|
+ @echo
|
|
|
@echo "Testing Dune 2000 mod MiniYAML..."
|
|
|
@mono --debug OpenRA.Utility.exe d2k --check-yaml
|
|
|
@echo
|
|
|
@@ -320,7 +335,7 @@
|
|
|
|
|
|
package: all-dependencies core tools docs version
|
|
|
|
|
|
-mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
|
|
|
+mods: mod_common mod_ra mod_cnc mod_d2k mod_ts mod_ra2
|
|
|
|
|
|
all: dependencies core tools
|
|
|
|
|
|
@@ -389,6 +404,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"
|
|
|
|
|
|
--- a/make.ps1
|
|
|
+++ b/make.ps1
|
|
|
@@ -136,6 +136,8 @@
|
|
|
echo "Testing mods..."
|
|
|
echo "Testing Tiberian Sun mod MiniYAML..."
|
|
|
./OpenRA.Utility.exe ts --check-yaml
|
|
|
+ echo "Testing Red Alert 2 mod MiniYAML..."
|
|
|
+ ./OpenRA.Utility.exe ra2 --check-yaml
|
|
|
echo "Testing Dune 2000 mod MiniYAML..."
|
|
|
./OpenRA.Utility.exe d2k --check-yaml
|
|
|
echo "Testing Tiberian Dawn mod MiniYAML..."
|
|
|
@@ -170,6 +172,8 @@
|
|
|
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k
|
|
|
echo "Checking for code style violations in OpenRA.Mods.TS..."
|
|
|
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.TS
|
|
|
+ echo "Checking for code style violations in OpenRA.Mods.RA2..."
|
|
|
+ ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.RA2
|
|
|
echo "Checking for code style violations in OpenRA.Utility..."
|
|
|
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility
|
|
|
echo "Checking for code style violations in OpenRA.Test..."
|
|
|
|
|
|
--- a/mods/all/mod.yaml
|
|
|
+++ b/mods/all/mod.yaml
|
|
|
@@ -20,6 +20,7 @@
|
|
|
d2k:OpenRA.Mods.D2k.dll
|
|
|
./mods/cnc/OpenRA.Mods.Cnc.dll
|
|
|
./mods/ts/OpenRA.Mods.TS.dll
|
|
|
+ ./mods/ts/OpenRA.Mods.RA2.dll
|
|
|
|
|
|
ChromeLayout:
|
|
|
|
|
|
--- a/mods/ra2/mod.yaml
|
|
|
+++ b/mods/ra2mod.yaml
|
|
|
@@ -5,7 +5,7 @@
|
|
|
Author: RA2 team
|
|
|
|
|
|
RequiresMods:
|
|
|
- modchooser: {DEV_VERSION}
|
|
|
+
|
|
|
|
|
|
Folders:
|
|
|
.
|
|
|
--- a/OpenRA.sln
|
|
|
+++ b/OpenRA.sln
|
|
|
@@ -17,6 +17,8 @@
|
|
|
EndProject
|
|
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.TS", "OpenRA.Mods.TS\OpenRA.Mods.TS.csproj", "{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}"
|
|
|
EndProject
|
|
|
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA2", "OpenRA.Mods.RA2\OpenRA.Mods.RA2.csproj", "{7E1263D2-BA04-48D0-85DB-26C68B782608}"
|
|
|
+EndProject
|
|
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Platforms.Default", "OpenRA.Platforms.Default\OpenRA.Platforms.Default.csproj", "{33D03738-C154-4028-8EA8-63A3C488A651}"
|
|
|
EndProject
|
|
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Common", "OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
|
|
|
@@ -139,6 +141,10 @@
|
|
|
{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.Build.0 = Debug|x86
|
|
|
{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.ActiveCfg = Release|x86
|
|
|
{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.Build.0 = Release|x86
|
|
|
+ {7E1263D2-BA04-48D0-85DB-26C68B782608}.Debug|x86.ActiveCfg = Debug|x86
|
|
|
+ {7E1263D2-BA04-48D0-85DB-26C68B782608}.Debug|x86.Build.0 = Debug|x86
|
|
|
+ {7E1263D2-BA04-48D0-85DB-26C68B782608}.Release|x86.ActiveCfg = Release|x86
|
|
|
+ {7E1263D2-BA04-48D0-85DB-26C68B782608}.Release|x86.Build.0 = Release|x86
|
|
|
{33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.ActiveCfg = Debug|x86
|
|
|
{33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.Build.0 = Debug|x86
|
|
|
{33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.ActiveCfg = Release|x86
|
|
|
|
|
|
--- 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%
|