mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Remove RCT2 interop code in proj / prop files

Browse Source
This commit is contained in:
Ted John
2017-06-13 12:13:47 +01:00
parent e70a96c04f
commit c609a0bff8
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openrct2.common.props
View File

@@ -43,7 +43,7 @@
C4245: 'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch C4245: 'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch
--> -->
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NO_RCT2;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
@@ -86,13 +86,6 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Debug|Win32 is reserved for RCT2 interop builds, this means it has to be a DLL -->
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'!='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>NO_RCT2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup> <PropertyGroup>

5
openrct2.proj
View File

@@ -16,7 +16,6 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration> <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
<Platform Condition="'$(PLATFORM)'==''">x64</Platform> <Platform Condition="'$(PLATFORM)'==''">x64</Platform>
<TestConfig Condition="'$(Configuration)'=='DebugTests' OR '$(Configuration)'=='ReleaseTests'">true</TestConfig>
<GIT_COMMIT_SHA1_SHORT Condition="'$(GIT_COMMIT_SHA1)'!=''">$(GIT_COMMIT_SHA1.Substring(0, 7))</GIT_COMMIT_SHA1_SHORT> <GIT_COMMIT_SHA1_SHORT Condition="'$(GIT_COMMIT_SHA1)'!=''">$(GIT_COMMIT_SHA1.Substring(0, 7))</GIT_COMMIT_SHA1_SHORT>
<Version>0.0.8</Version> <Version>0.0.8</Version>
@@ -76,8 +75,8 @@
<ItemGroup> <ItemGroup>
<g2Inputs Include="$(RootDir)resources\g2\*" /> <g2Inputs Include="$(RootDir)resources\g2\*" />
<SignItems Include="$(OutputExe)" /> <SignItems Include="$(OutputExe)" />
<SignItems Include="$(OutputDll)" />
<SignItems Include="$(OutputCom)" /> <SignItems Include="$(OutputCom)" />
<SignItems Include="$(OutputDll)" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Symbol Items"> <ItemGroup Label="Symbol Items">
@@ -143,7 +142,6 @@
<SlnProperties>$(SlnProperties);Configuration=$(Configuration)</SlnProperties> <SlnProperties>$(SlnProperties);Configuration=$(Configuration)</SlnProperties>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<CleanItems Condition="'$(Platform)'=='Win32'" Include="$(OutputExe)" />
<CleanItems Include="$(OutputCom)" /> <CleanItems Include="$(OutputCom)" />
<CleanItems Include="$(g2Output)" /> <CleanItems Include="$(g2Output)" />
<CleanItems Include="$(ArtifactsDir)openrct2-installer-$(Configuration)-$(Platform)*.exe" /> <CleanItems Include="$(ArtifactsDir)openrct2-installer-$(Configuration)-$(Platform)*.exe" />
@@ -162,7 +160,6 @@
<BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString> <BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<CopyItems Condition="'$(Platform)'=='Win32'" Include="$(RootDir)openrct2.exe" />
<DataItems Include="$(RootDir)data\**\*" /> <DataItems Include="$(RootDir)data\**\*" />
</ItemGroup> </ItemGroup>
<Message Condition="'$(BuildString)'!=''" Text="Building $(BuildString)" Importance="high" /> <Message Condition="'$(BuildString)'!=''" Text="Building $(BuildString)" Importance="high" />