Browse Source

Fix Windows compilation

master
Fincer 8 years ago
parent
commit
27955e30cd
1 changed files with 41 additions and 61 deletions
  1. +41
    -61
      data/patches/windows/windows-ra2-csproj.patch

+ 41
- 61
data/patches/windows/windows-ra2-csproj.patch View File

@ -1,67 +1,52 @@
--- a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj --- a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj
+++ b/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>
@@ -12,35 +12,50 @@
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
- <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
<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> + <ErrorReport>prompt</ErrorReport>
+ <CustomCommands>
+ <CustomCommands>
<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} ../mods/ra2" workingdir="${ProjectDir}" />
+ <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" /> + <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />
+ </CustomCommands>
+ </CustomCommands>
</CustomCommands>
</CustomCommands>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <DebugType>full</DebugType>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </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' "> - <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
- <DebugSymbols>False</DebugSymbols> - <DebugSymbols>False</DebugSymbols>
- <DebugType>None</DebugType> - <DebugType>None</DebugType>
- <Optimize>True</Optimize>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <DebugSymbols>True</DebugSymbols>
+ <DebugType>pdbonly</DebugType> + <DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget> + <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport> + <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <Optimize>true</Optimize>
+ <CustomCommands>
+ <CustomCommands>
<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} ../mods/ra2" workingdir="${ProjectDir}" />
+ <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" /> + <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />
+ </CustomCommands>
+ </CustomCommands>
</CustomCommands>
</CustomCommands>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
+ <Reference Include="System" /> + <Reference Include="System" />
@ -71,9 +56,13 @@
+ <HintPath>..\thirdparty\download\Eluant.dll</HintPath> + <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
+ <Private>False</Private> + <Private>False</Private>
+ </Reference> + </Reference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="OpenRA.Game">
<HintPath>dependencies\OpenRA.Game.exe</HintPath>
@@ -68,9 +83,26 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
+ <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj"> + <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+ <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project> + <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+ <Name>OpenRA.Game</Name> + <Name>OpenRA.Game</Name>
@ -86,20 +75,11 @@
+ </ProjectReference> + </ProjectReference>
+ </ItemGroup> + </ItemGroup>
+ <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>
<Compile Include="Activities\ChronoResourceTeleport.cs" />
<Compile Include="Traits\ChronoResourceDelivery.cs" />
<Compile Include="Traits\Render\WithExitOverlay.cs" />
<Compile Include="Traits\Render\WithSwimSuit.cs" />
</ItemGroup> </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Stub.cs" />
- </ItemGroup>
+ <PropertyGroup> + <PropertyGroup>
+ <PostBuildEvent>mkdir "$(SolutionDir)mods/ra2/" + <PostBuildEvent>mkdir "$(SolutionDir)mods/ra2/"
+copy "$(TargetPath)" "$(SolutionDir)mods/ra2/" +copy "$(TargetPath)" "$(SolutionDir)mods/ra2/"


Loading…
Cancel
Save