@ -1,33 +0,0 @@ | |||||
--- a/mods/all/mod.yaml | |||||
+++ b/mods/all/mod.yaml | |||||
@@ -17,6 +17,7 @@ | |||||
Assemblies: | |||||
./mods/common/OpenRA.Mods.Common.dll | |||||
./mods/ra/OpenRA.Mods.RA.dll | |||||
+ ./mods/d2/OpenRA.Mods.D2.dll | |||||
./mods/d2k/OpenRA.Mods.D2k.dll | |||||
./mods/cnc/OpenRA.Mods.Cnc.dll | |||||
./mods/ts/OpenRA.Mods.TS.dll | |||||
--- a/mods/d2/mod.yaml | |||||
+++ b/mods/d2/mod.yaml | |||||
@@ -5,7 +5,7 @@ | |||||
Author: the OpenRA Developers | |||||
RequiresMods: | |||||
- modchooser: {DEV_VERSION} | |||||
+ | |||||
Packages: | |||||
~^Content/d2 | |||||
--- a/utility.cmd | |||||
+++ b/utility.cmd | |||||
@@ -17,6 +17,7 @@ | |||||
if /I "%mod%" EQU "cnc" (goto help) | |||||
if /I "%mod%" EQU "ts" (goto help) | |||||
if /I "%mod%" EQU "d2k" (goto help) | |||||
+if /I "%mod%" EQU "d2" (goto help) | |||||
echo. | |||||
echo Unknown mod: %mod% | |||||
echo. |
@ -1,10 +0,0 @@ | |||||
--- a/Makefile | |||||
+++ b/Makefile | |||||
@@ -324,7 +339,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_d2 mod_ts mod_ra2 | |||||
all: dependencies core tools |
@ -1,47 +0,0 @@ | |||||
--- a/Makefile | |||||
+++ b/Makefile | |||||
@@ -173,6 +173,15 @@ | |||||
PROGRAMS += mod_d2k | |||||
mod_d2k: $(mod_d2k_TARGET) | |||||
+# Dune 2 | |||||
+mod_d2_SRCS := $(shell find OpenRA.Mods.D2/ -iname '*.cs') | |||||
+mod_d2_TARGET = mods/d2/OpenRA.Mods.D2.dll | |||||
+mod_d2_KIND = library | |||||
+mod_d2_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) | |||||
+mod_d2_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) | |||||
+PROGRAMS += mod_d2 | |||||
+mod_d2: $(mod_d2_TARGET) | |||||
+ | |||||
# Tiberian Sun | |||||
mod_ts_SRCS := $(shell find OpenRA.Mods.TS/ -iname '*.cs') | |||||
mod_ts_TARGET = mods/ts/OpenRA.Mods.TS.dll | |||||
@@ -214,6 +223,9 @@ | |||||
@echo "Checking for code style violations in OpenRA.Mods.D2k..." | |||||
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k | |||||
@echo | |||||
+ @echo "Checking for code style violations in OpenRA.Mods.D2..." | |||||
+ @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2 | |||||
+ @echo | |||||
@echo "Checking for code style violations in OpenRA.Mods.TS..." | |||||
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS | |||||
@echo | |||||
@@ -247,6 +259,9 @@ | |||||
test: utility mods | |||||
@echo | |||||
+ @echo "Testing Dune 2 mod MiniYAML..." | |||||
+ @mono --debug OpenRA.Utility.exe d2 --check-yaml | |||||
+ @echo | |||||
@echo "Testing Tiberian Sun mod MiniYAML..." | |||||
@mono --debug OpenRA.Utility.exe ts --check-yaml | |||||
@echo | |||||
@@ -391,6 +406,8 @@ | |||||
@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc" | |||||
@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/" | |||||
@$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra" | |||||
+ @$(CP_R) mods/d2 "$(DATA_INSTALL_DIR)/mods/" | |||||
+ @$(INSTALL_PROGRAM) $(mod_d2_TARGET) "$(DATA_INSTALL_DIR)/mods/d2" | |||||
@$(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/" |
@ -1,33 +0,0 @@ | |||||
--- 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% |
@ -1,10 +0,0 @@ | |||||
--- a/Makefile | |||||
+++ b/Makefile | |||||
@@ -324,7 +339,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 |
@ -1,33 +0,0 @@ | |||||
--- a/mods/all/mod.yaml | |||||
+++ b/mods/all/mod.yaml | |||||
@@ -17,6 +17,7 @@ | |||||
Assemblies: | |||||
./mods/common/OpenRA.Mods.Common.dll | |||||
./mods/ra/OpenRA.Mods.RA.dll | |||||
+ ./mods/d2/OpenRA.Mods.D2.dll | |||||
./mods/d2k/OpenRA.Mods.D2k.dll | |||||
./mods/cnc/OpenRA.Mods.Cnc.dll | |||||
./mods/ts/OpenRA.Mods.TS.dll | |||||
--- a/mods/d2/mod.yaml | |||||
+++ b/mods/d2/mod.yaml | |||||
@@ -5,7 +5,7 @@ | |||||
Author: the OpenRA Developers | |||||
RequiresMods: | |||||
- modchooser: {DEV_VERSION} | |||||
+ | |||||
Packages: | |||||
~^Content/d2 | |||||
--- a/utility.cmd | |||||
+++ b/utility.cmd | |||||
@@ -17,6 +17,7 @@ | |||||
if /I "%mod%" EQU "cnc" (goto help) | |||||
if /I "%mod%" EQU "ts" (goto help) | |||||
if /I "%mod%" EQU "d2k" (goto help) | |||||
+if /I "%mod%" EQU "d2" (goto help) | |||||
echo. | |||||
echo Unknown mod: %mod% | |||||
echo. |
@ -1,70 +0,0 @@ | |||||
--- a/OpenRA.Mods.D2/OpenRA.Mods.D2.csproj | |||||
+++ b/OpenRA.Mods.D2/OpenRA.Mods.D2.csproj | |||||
@@ -17,8 +17,8 @@ | |||||
<ErrorReport>prompt</ErrorReport> | |||||
<OutputPath>bin\Debug\</OutputPath> | |||||
<CustomCommands> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile} .." workingdir="${ProjectDir}" /> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile}.mdb .." workingdir="${ProjectDir}" /> | |||||
+ <Command type="AfterBuild" command="cp ${TargetFile} ../mods/d2" workingdir="${ProjectDir}" /> | |||||
+ <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/d2" workingdir="${ProjectDir}" /> | |||||
</CustomCommands> | |||||
<DefineConstants>TRACE;DEBUG;</DefineConstants> | |||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> | |||||
@@ -36,20 +36,20 @@ | |||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> | |||||
<Optimize>true</Optimize> | |||||
<CustomCommands> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile} .." workingdir="${ProjectDir}" /> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile}.mdb .." workingdir="${ProjectDir}" /> | |||||
+ <Command type="AfterBuild" command="cp ${TargetFile} ../mods/d2" workingdir="${ProjectDir}" /> | |||||
+ <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/d2" workingdir="${ProjectDir}" /> | |||||
</CustomCommands> | |||||
<Prefer32Bit>false</Prefer32Bit> | |||||
</PropertyGroup> | |||||
<ItemGroup> | |||||
<Reference Include="OpenRA.Game"> | |||||
- <HintPath>dependencies\OpenRA.Game.exe</HintPath> | |||||
+ <HintPath>..\OpenRA.Mods.RA\OpenRA.Game.exe</HintPath> | |||||
</Reference> | |||||
<Reference Include="OpenRA.Mods.Common"> | |||||
- <HintPath>dependencies\OpenRA.Mods.Common.dll</HintPath> | |||||
+ <HintPath>..\OpenRA.Mods.RA\OpenRA.Mods.Common.dll</HintPath> | |||||
</Reference> | |||||
<Reference Include="Eluant"> | |||||
- <HintPath>dependencies\Eluant.dll</HintPath> | |||||
+ <HintPath>..\thirdparty\download\Eluant.dll</HintPath> | |||||
<Private>False</Private> | |||||
</Reference> | |||||
<Reference Include="System" /> | |||||
@@ -59,6 +59,18 @@ | |||||
<Reference Include="System.Xml.Linq" /> | |||||
</ItemGroup> | |||||
<Import Project="$(MSBuildToolsPath)\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="SpriteLoaders\IcnD2Loader.cs" /> | |||||
<Compile Include="SpriteLoaders\CpsD2Loader.cs" /> | |||||
@@ -72,7 +84,8 @@ | |||||
<Compile Include="D2LoadScreen.cs" /> | |||||
</ItemGroup> | |||||
<PropertyGroup> | |||||
- <PostBuildEvent>copy $(TargetPath) $(ProjectDir).. | |||||
-</PostBuildEvent> | |||||
+ <PostBuildEvent>mkdir "$(SolutionDir)mods/d2/" | |||||
+copy "$(TargetPath)" "$(SolutionDir)mods/d2/" | |||||
+cd "$(SolutionDir)"</PostBuildEvent> | |||||
</PropertyGroup> | |||||
</Project> | |||||
\ No newline at end of file |
@ -1,11 +0,0 @@ | |||||
--- a/make.ps1 | |||||
+++ b/make.ps1 | |||||
@@ -71,7 +71,7 @@ | |||||
if ($version -ne $null) | |||||
{ | |||||
- $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") | |||||
+ $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/d2/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") | |||||
foreach ($mod in $mods) | |||||
{ | |||||
$replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) |
@ -1,20 +0,0 @@ | |||||
--- a/make.ps1 | |||||
+++ b/make.ps1 | |||||
@@ -117,6 +117,8 @@ | |||||
./OpenRA.Utility.exe cnc --check-yaml | |||||
echo "Testing Red Alert mod MiniYAML..." | |||||
./OpenRA.Utility.exe ra --check-yaml | |||||
+ echo "Testing Dune 2 mod MiniYAML..." | |||||
+ ./OpenRA.Utility.exe d2 --check-yaml | |||||
} | |||||
else | |||||
{ | |||||
@@ -141,6 +143,8 @@ | |||||
./OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA | |||||
echo "Checking for code style violations in OpenRA.Mods.Cnc..." | |||||
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc | |||||
+ echo "Checking for code style violations in OpenRA.Mods.D2..." | |||||
+ ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2 | |||||
echo "Checking for code style violations in OpenRA.Mods.D2k..." | |||||
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k | |||||
echo "Checking for code style violations in OpenRA.Mods.TS..." |
@ -1,22 +0,0 @@ | |||||
--- a/OpenRA.sln | |||||
+++ b/OpenRA.sln | |||||
@@ -13,6 +13,8 @@ | |||||
EndProject | |||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Server", "OpenRA.Server\OpenRA.Server.csproj", "{76F621A1-3D8E-4A99-9F7E-B071EB657817}" | |||||
EndProject | |||||
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.D2", "OpenRA.Mods.D2\OpenRA.Mods.D2.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4341}" | |||||
+EndProject | |||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.D2k", "OpenRA.Mods.D2k\OpenRA.Mods.D2k.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4344}" | |||||
EndProject | |||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.TS", "OpenRA.Mods.TS\OpenRA.Mods.TS.csproj", "{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}" | |||||
@@ -158,6 +160,10 @@ | |||||
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.Build.0 = Debug|x86 | |||||
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.ActiveCfg = Release|x86 | |||||
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.Build.0 = Release|x86 | |||||
+ {C0B0465C-6BE2-409C-8770-3A9BF64C4341}.Debug|x86.ActiveCfg = Debug|x86 | |||||
+ {C0B0465C-6BE2-409C-8770-3A9BF64C4341}.Debug|x86.Build.0 = Debug|x86 | |||||
+ {C0B0465C-6BE2-409C-8770-3A9BF64C4341}.Release|x86.ActiveCfg = Release|x86 | |||||
+ {C0B0465C-6BE2-409C-8770-3A9BF64C4341}.Release|x86.Build.0 = Release|x86 | |||||
{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.ActiveCfg = Debug|x86 | |||||
{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.Build.0 = Debug|x86 | |||||
{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.ActiveCfg = Release|x86 |
@ -1,33 +0,0 @@ | |||||
--- 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% |
@ -1,109 +0,0 @@ | |||||
--- a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj | |||||
+++ b/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj | |||||
@@ -12,53 +12,64 @@ | |||||
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> | |||||
<PlatformTarget>x86</PlatformTarget> | |||||
</PropertyGroup> | |||||
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | |||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> | |||||
<DebugSymbols>True</DebugSymbols> | |||||
<DebugType>Full</DebugType> | |||||
<Optimize>False</Optimize> | |||||
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> | |||||
<DefineConstants>DEBUG;TRACE</DefineConstants> | |||||
<OutputPath>bin\Debug\</OutputPath> | |||||
+ <PlatformTarget>x86</PlatformTarget> | |||||
+ <ErrorReport>prompt</ErrorReport> | |||||
<CustomCommands> | |||||
<CustomCommands> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile} .." workingdir="${ProjectDir}" /> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile}.mdb .." workingdir="${ProjectDir}" /> | |||||
+ <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> | |||||
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||||
</PropertyGroup> | |||||
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> | |||||
- <DebugSymbols>False</DebugSymbols> | |||||
- <DebugType>None</DebugType> | |||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> | |||||
+ <DebugSymbols>True</DebugSymbols> | |||||
+ <DebugType>pdbonly</DebugType> | |||||
<Optimize>True</Optimize> | |||||
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | |||||
<DefineConstants>TRACE</DefineConstants> | |||||
<OutputPath>bin\Release\</OutputPath> | |||||
+ <PlatformTarget>x86</PlatformTarget> | |||||
+ <ErrorReport>prompt</ErrorReport> | |||||
<CustomCommands> | |||||
<CustomCommands> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile} .." workingdir="${ProjectDir}" /> | |||||
- <Command type="AfterBuild" command="cp ${TargetFile}.mdb .." workingdir="${ProjectDir}" /> | |||||
+ <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> | |||||
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||||
</PropertyGroup> | |||||
<ItemGroup> | |||||
+ <Reference Include="System" /> | |||||
+ <Reference Include="System.Core" /> | |||||
+ <Reference Include="System.Drawing" /> | |||||
<Reference Include="Microsoft.CSharp" /> | |||||
<Reference Include="OpenRA.Game"> | |||||
- <HintPath>dependencies\OpenRA.Game.exe</HintPath> | |||||
+ <HintPath>..\OpenRA.Mods.RA\OpenRA.Game.exe</HintPath> | |||||
</Reference> | |||||
<Reference Include="OpenRA.Mods.Common"> | |||||
- <HintPath>dependencies\OpenRA.Mods.Common.dll</HintPath> | |||||
+ <HintPath>..\OpenRA.Mods.RA\OpenRA.Mods.Common.dll</HintPath> | |||||
</Reference> | |||||
<Reference Include="OpenRA.Mods.RA"> | |||||
- <HintPath>dependencies\OpenRA.Mods.RA.dll</HintPath> | |||||
+ <HintPath>..\OpenRA.Mods.RA\OpenRA.Mods.RA.dll</HintPath> | |||||
</Reference> | |||||
<Reference Include="OpenRA.Mods.TS"> | |||||
- <HintPath>dependencies\OpenRA.Mods.TS.dll</HintPath> | |||||
+ <HintPath>..\OpenRA.Mods.TS\OpenRA.Mods.TS.dll</HintPath> | |||||
</Reference> | |||||
<Reference Include="Eluant"> | |||||
- <HintPath>dependencies\Eluant.dll</HintPath> | |||||
+ <HintPath>..\thirdparty\download\Eluant.dll</HintPath> | |||||
</Reference> | |||||
<Reference Include="Eluant"> | |||||
- <HintPath>dependencies\Eluant.dll</HintPath> | |||||
+ <HintPath>..\thirdparty\download\Eluant.dll</HintPath> | |||||
<Private>False</Private> | |||||
</Reference> | |||||
<Reference Include="System" /> | |||||
@@ -68,10 +79,27 @@ | |||||
</ItemGroup> | |||||
<Import Project="$(MSBuildToolsPath)\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="Activities\ChronoResourceTeleport.cs" /> | |||||
<Compile Include="Traits\ChronoResourceDelivery.cs" /> | |||||
<Compile Include="Traits\Render\WithExitOverlay.cs" /> | |||||
<Compile Include="Traits\Render\WithSwimSuit.cs" /> | |||||
</ItemGroup> | |||||
+ <PropertyGroup> | |||||
+ <PostBuildEvent>mkdir "$(SolutionDir)mods/ra2/" | |||||
+copy "$(TargetPath)" "$(SolutionDir)mods/ra2/" | |||||
+cd "$(SolutionDir)"</PostBuildEvent> | |||||
+ </PropertyGroup> | |||||
</Project> | |||||
@ -1,11 +0,0 @@ | |||||
--- a/make.ps1 | |||||
+++ b/make.ps1 | |||||
@@ -71,7 +71,7 @@ | |||||
if ($version -ne $null) | |||||
{ | |||||
- $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") | |||||
+ $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") | |||||
foreach ($mod in $mods) | |||||
{ | |||||
$replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) |
@ -1,20 +0,0 @@ | |||||
--- a/make.ps1 | |||||
+++ b/make.ps1 | |||||
@@ -111,6 +111,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..." | |||||
@@ -145,6 +147,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..." |
@ -1,22 +0,0 @@ | |||||
--- 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 |