|
|
--- a/Makefile
|
|
|
+++ b/Makefile
|
|
|
@@ -42,7 +42,7 @@
|
|
|
|
|
|
############################## TOOLCHAIN ###############################
|
|
|
#
|
|
|
-CSC = mcs -sdk:4.0
|
|
|
+CSC = mcs
|
|
|
CSFLAGS = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
|
|
|
DEFINE = TRACE
|
|
|
COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
|
|
|
|
|
|
--- a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj
|
|
|
+++ b/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj
|
|
|
@@ -1,33 +1,74 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
|
|
|
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
<PropertyGroup>
|
|
|
- <ProjectGuid>{7E1263D2-BA04-48D0-85DB-26C68B782608}</ProjectGuid>
|
|
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
|
+ <ProductVersion>10.0.0</ProductVersion>
|
|
|
+ <SchemaVersion>2.0</SchemaVersion>
|
|
|
+ <ProjectGuid>{7E1263D2-BA04-48D0-85DB-26C68B782608}</ProjectGuid>
|
|
|
<OutputType>Library</OutputType>
|
|
|
<RootNamespace>OpenRA.Mods.RA2</RootNamespace>
|
|
|
<AssemblyName>OpenRA.Mods.RA2</AssemblyName>
|
|
|
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
|
|
- <OutputPath>..</OutputPath>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
|
|
|
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
|
|
+ <DebugSymbols>true</DebugSymbols>
|
|
|
+ <OutputPath>bin\Debug\</OutputPath>
|
|
|
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
|
|
|
<PlatformTarget>x86</PlatformTarget>
|
|
|
+ <ErrorReport>prompt</ErrorReport>
|
|
|
+ <CustomCommands>
|
|
|
+ <CustomCommands>
|
|
|
+ <Command type="AfterBuild" command="cp ${TargetFile} ../mods/ra2" workingdir="${ProjectDir}" />
|
|
|
+ <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />
|
|
|
+ </CustomCommands>
|
|
|
+ </CustomCommands>
|
|
|
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
|
+ <DebugType>full</DebugType>
|
|
|
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
|
|
- <DebugSymbols>True</DebugSymbols>
|
|
|
- <DebugType>Full</DebugType>
|
|
|
- <Optimize>False</Optimize>
|
|
|
- <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
|
|
|
- <DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
|
- </PropertyGroup>
|
|
|
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
|
|
- <DebugSymbols>False</DebugSymbols>
|
|
|
- <DebugType>None</DebugType>
|
|
|
- <Optimize>True</Optimize>
|
|
|
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
|
|
|
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
|
|
+ <DebugSymbols>true</DebugSymbols>
|
|
|
+ <OutputPath>bin\Release\</OutputPath>
|
|
|
<DefineConstants>TRACE</DefineConstants>
|
|
|
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
|
+ <DebugType>pdbonly</DebugType>
|
|
|
+ <PlatformTarget>x86</PlatformTarget>
|
|
|
+ <ErrorReport>prompt</ErrorReport>
|
|
|
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
|
+ <Optimize>true</Optimize>
|
|
|
+ <CustomCommands>
|
|
|
+ <CustomCommands>
|
|
|
+ <Command type="AfterBuild" command="cp ${TargetFile} ../mods/ra2" workingdir="${ProjectDir}" />
|
|
|
+ <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />
|
|
|
+ </CustomCommands>
|
|
|
+ </CustomCommands>
|
|
|
</PropertyGroup>
|
|
|
<ItemGroup>
|
|
|
+ <Reference Include="System" />
|
|
|
+ <Reference Include="System.Core" />
|
|
|
+ <Reference Include="System.Drawing" />
|
|
|
+ <Reference Include="Eluant">
|
|
|
+ <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
|
|
|
+ <Private>False</Private>
|
|
|
+ </Reference>
|
|
|
+ </ItemGroup>
|
|
|
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
|
|
+ <ItemGroup>
|
|
|
+ <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
|
|
|
+ <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
|
|
|
+ <Name>OpenRA.Game</Name>
|
|
|
+ <Private>False</Private>
|
|
|
+ </ProjectReference>
|
|
|
+ <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
|
|
|
+ <Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>
|
|
|
+ <Name>OpenRA.Mods.Common</Name>
|
|
|
+ <Private>False</Private>
|
|
|
+ </ProjectReference>
|
|
|
+ </ItemGroup>
|
|
|
+ <ItemGroup>
|
|
|
+ <Compile Include="Stub.cs" />
|
|
|
+ </ItemGroup>
|
|
|
+ <ItemGroup>
|
|
|
<Reference Include="Microsoft.CSharp">
|
|
|
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
|
|
</Reference>
|
|
|
@@ -52,8 +93,9 @@
|
|
|
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
|
|
</Reference>
|
|
|
</ItemGroup>
|
|
|
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
|
- <ItemGroup>
|
|
|
- <Compile Include="Stub.cs" />
|
|
|
- </ItemGroup>
|
|
|
-</Project>
|
|
|
+ <PropertyGroup>
|
|
|
+ <PostBuildEvent>mkdir "$(SolutionDir)mods/ra2/"
|
|
|
+copy "$(TargetPath)" "$(SolutionDir)mods/ra2/"
|
|
|
+cd "$(SolutionDir)"</PostBuildEvent>
|
|
|
+ </PropertyGroup>
|
|
|
+</Project>
|
|
|
\ No newline at end of file
|
|
|
|
|
|
--- 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%
|