Update buildsystem/ci

Update for Visual Studio Community 2017 15.5.0. In all Visual Studio project files: - C++ version is C++ 17 - Enforce type conversion rules is enabled - Runtime type support is enabled - OpenMP support is disabled - Remove references to non-existing projects
egoboo · Dec 7, 2017 · 66fe884 · 66fe884
1 parent 894285c
commit 66fe884
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 42 deletions.
diff --git a/cartman/cartman.vcxproj b/cartman/cartman.vcxproj
@@ -23,7 +23,7 @@
  <ProjectGuid>{87DFC5F5-A78E-4BE2-AEB7-AFB8DA3DBD63}</ProjectGuid>
  <RootNamespace>cartman</RootNamespace>
  <Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -136,7 +136,7 @@
  <ControlFlowGuard>false</ControlFlowGuard>
  <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
  <FloatingPointModel>Fast</FloatingPointModel>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <AdditionalDependencies>shlwapi.lib;SHFolder.lib;Shell32.lib;ws2_32.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -204,7 +204,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <FloatingPointModel>Fast</FloatingPointModel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>
@@ -268,7 +268,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
  <FloatingPointModel>Fast</FloatingPointModel>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <AdditionalDependencies>shlwapi.lib;SHFolder.lib;Shell32.lib;ws2_32.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -326,7 +326,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <WarningLevel>Level4</WarningLevel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>

diff --git a/egoboo.sln b/egoboo.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcxproj", "{E9988340-E474-4C0A-8496-EFF3296DE056}"
  ProjectSection(ProjectDependencies) = postProject

diff --git a/egolib/egolib-tests.vcxproj b/egolib/egolib-tests.vcxproj
@@ -53,7 +53,7 @@
  <ProjectGuid>{72193166-DDB9-4393-8413-59E8D843DD9D}</ProjectGuid>
  <Keyword>Win32Proj</Keyword>
  <RootNamespace>egolibtests</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -175,7 +175,7 @@
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <SubSystem>Console</SubSystem>
@@ -216,7 +216,7 @@
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <SubSystem>Console</SubSystem>
@@ -255,7 +255,7 @@
  <FloatingPointModel>Fast</FloatingPointModel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>
@@ -297,7 +297,7 @@
  <FloatingPointModel>Fast</FloatingPointModel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>

diff --git a/egolib/egolib.vcxproj b/egolib/egolib.vcxproj
@@ -22,7 +22,7 @@
  <ProjectName>egolib</ProjectName>
  <ProjectGuid>{0F32DD35-A264-4906-8FC9-2D0FE0613230}</ProjectGuid>
  <Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -139,7 +139,7 @@
  <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
  <FloatingPointModel>Fast</FloatingPointModel>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Lib>
  <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
@@ -186,7 +186,7 @@
  <WarningLevel>Level4</WarningLevel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Lib>
@@ -254,7 +254,7 @@
  <WarningLevel>Level4</WarningLevel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Lib />
@@ -300,7 +300,7 @@
  <WarningLevel>Level4</WarningLevel>
  <FloatingPointModel>Fast</FloatingPointModel>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Lib>
  <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -894,12 +894,6 @@
  <ProjectReference Include="..\external\SDL2_ttf-2.0.12\VisualC\SDL_ttf.vcxproj">
  <Project>{d114a863-1bdc-4979-a61e-cb6b7ca5f1bb}</Project>
  </ProjectReference>
- <ProjectReference Include="..\idlib\idlib.vcxproj">
- <Project>{f59e5a93-844c-4c7f-bffa-c0e59785b9a2}</Project>
- </ProjectReference>
- <ProjectReference Include="..\idlib\legacy\idlib.vcxproj">
- <Project>{1af1ead3-b754-426e-96df-6c9075782b5e}</Project>
- </ProjectReference>
  <ProjectReference Include="..\legacy\idlib.vcxproj">
  <Project>{1af1ead3-b754-426e-96df-6c9075782b5e}</Project>
  </ProjectReference>

diff --git a/external b/external
diff --git a/game/game.vcxproj b/game/game.vcxproj
@@ -23,7 +23,7 @@
  <ProjectGuid>{E9988340-E474-4C0A-8496-EFF3296DE056}</ProjectGuid>
  <RootNamespace>game</RootNamespace>
  <Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -161,7 +161,7 @@
  <ControlFlowGuard>false</ControlFlowGuard>
  <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
  <FloatingPointModel>Fast</FloatingPointModel>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <AdditionalDependencies>shlwapi.lib;SHFolder.lib;Shell32.lib;ws2_32.lib;Advapi32.lib;User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -236,7 +236,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <ControlFlowGuard>false</ControlFlowGuard>
  <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
  <FloatingPointModel>Fast</FloatingPointModel>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <AdditionalDependencies>shlwapi.lib;SHFolder.lib;Shell32.lib;ws2_32.lib;Advapi32.lib;User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -310,7 +310,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <WarningLevel>Level4</WarningLevel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>
@@ -383,7 +383,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <WarningLevel>Level4</WarningLevel>
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>

diff --git a/legacy/idlib-game-engine.vcxproj.user b/legacy/idlib-game-engine.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http:https://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
diff --git a/legacy/idlib.vcxproj b/legacy/idlib.vcxproj
@@ -139,6 +139,9 @@
  <AdditionalIncludeDirectories>$(ProjectDir)..\idlib\library\src</AdditionalIncludeDirectories>
  <LanguageStandard>stdcpp17</LanguageStandard>
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <OpenMPSupport>false</OpenMPSupport>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -149,6 +152,9 @@
  <AdditionalIncludeDirectories>$(ProjectDir)..\idlib\library\src</AdditionalIncludeDirectories>
  <LanguageStandard>stdcpp17</LanguageStandard>
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <OpenMPSupport>false</OpenMPSupport>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -161,6 +167,9 @@
  <AdditionalIncludeDirectories>$(ProjectDir)..\idlib\library\src</AdditionalIncludeDirectories>
  <LanguageStandard>stdcpp17</LanguageStandard>
  <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <OpenMPSupport>false</OpenMPSupport>
  </ClCompile>
  <Link>
  <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -177,6 +186,9 @@
  <AdditionalIncludeDirectories>$(ProjectDir)..\idlib\library\src</AdditionalIncludeDirectories>
  <LanguageStandard>stdcpp17</LanguageStandard>
  <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <OpenMPSupport>false</OpenMPSupport>
  </ClCompile>
  <Link>
  <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/utilities/migrator/migrator.vcxproj b/utilities/migrator/migrator.vcxproj
@@ -23,7 +23,7 @@
  <Keyword>Win32Proj</Keyword>
  <RootNamespace>ConvertPaletted</RootNamespace>
  <ProjectName>migrator</ProjectName>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -132,7 +132,7 @@
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <SubSystem>Console</SubSystem>
@@ -190,7 +190,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <MinimalRebuild>false</MinimalRebuild>
  <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  <BufferSecurityCheck>false</BufferSecurityCheck>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  </ClCompile>
  <Link>
  <SubSystem>Console</SubSystem>
@@ -247,7 +247,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/utilities/migrator/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>
@@ -305,7 +305,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <FloatingPointExceptions>false</FloatingPointExceptions>
  <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/utilities/migrator/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <ControlFlowGuard>false</ControlFlowGuard>
- <LanguageStandard>stdcpplatest</LanguageStandard>
+ <LanguageStandard>stdcpp17</LanguageStandard>
  <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
  </ClCompile>
  <Link>
@@ -363,15 +363,6 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <ProjectReference Include="..\..\external\SDL2_ttf-2.0.12\VisualC\SDL_ttf.vcxproj">
  <Project>{d114a863-1bdc-4979-a61e-cb6b7ca5f1bb}</Project>
  </ProjectReference>
- <ProjectReference Include="..\..\idlib\idlib-tests.vcxproj">
- <Project>{53aa7468-e768-4cc9-a5ed-21a70c5fc36c}</Project>
- </ProjectReference>
- <ProjectReference Include="..\..\idlib\idlib.vcxproj">
- <Project>{f59e5a93-844c-4c7f-bffa-c0e59785b9a2}</Project>
- </ProjectReference>
- <ProjectReference Include="..\..\idlib\legacy\idlib.vcxproj">
- <Project>{1af1ead3-b754-426e-96df-6c9075782b5e}</Project>
- </ProjectReference>
  <ProjectReference Include="..\..\legacy\idlib.vcxproj">
  <Project>{1af1ead3-b754-426e-96df-6c9075782b5e}</Project>
  </ProjectReference>