From 66dc4599ca6081923b80254707176b20c0e29a3b Mon Sep 17 00:00:00 2001
From: Evan Wallace <onlyone@senet.com.au>
Date: Sun, 13 Dec 2015 19:35:42 +1100
Subject: [PATCH 1/3] Made HourglassII and HourglassIIUnity projects actually
 identical in configuration (apart from compiling different files). Eliminated
 warnings introduced by MSVC2015 Update 1.

---
 ide/msvc2015/HourglassII/HourglassII.sln      |   2 +-
 .../HourglassII/HourglassII.vcxproj           |  64 +++---
 .../HourglassIIUnity/HourglassIIUnity.vcxproj | 204 +++++++++++++++++-
 3 files changed, 232 insertions(+), 38 deletions(-)

diff --git a/ide/msvc2015/HourglassII/HourglassII.sln b/ide/msvc2015/HourglassII/HourglassII.sln
index 99ea9cfd..bc68e0fc 100644
--- a/ide/msvc2015/HourglassII/HourglassII.sln
+++ b/ide/msvc2015/HourglassII/HourglassII.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HourglassII", "HourglassII\HourglassII.vcxproj", "{6B51453F-145F-4852-936C-03D50D848279}"
 EndProject
diff --git a/ide/msvc2015/HourglassII/HourglassII/HourglassII.vcxproj b/ide/msvc2015/HourglassII/HourglassII/HourglassII.vcxproj
index 92382a11..1e7b8ae7 100644
--- a/ide/msvc2015/HourglassII/HourglassII/HourglassII.vcxproj
+++ b/ide/msvc2015/HourglassII/HourglassII/HourglassII.vcxproj
@@ -12,8 +12,8 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6B51453F-145F-4852-936C-03D50D848279}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
     <RootNamespace>HourglassII</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -32,21 +32,20 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -55,60 +54,71 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>GLEW_BUILD;NOMINMAX;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_THREAD_VERSION=4;_DEBUG;_WINDOWS;_UNICODE%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>
-      </PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
       <AdditionalIncludeDirectories>..\..\..\..\ext\boost\include;..\..\..\..\ext\SFML\include;..\..\..\..\ext\tbb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <EnablePREfast>false</EnablePREfast>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <FloatingPointModel>Strict</FloatingPointModel>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
-      <DisableSpecificWarnings>4100;4127;4191;4242;4265;4365;4371;4373;4514;4548;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4061;4127;4191;4242;4265;4365;4371;4373;4464;4514;4548;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027;5031</DisableSpecificWarnings>
+      <EnablePREfast>false</EnablePREfast>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <ShowIncludes>false</ShowIncludes>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\ext\boost\lib;$(SolutionDir)..\..\..\ext\SFML\lib;$(SolutionDir)..\..\..\ext\tbb\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>sfml-graphics-d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-system-d.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>EnableAllWarnings</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>GLEW_BUILD;NOMINMAX;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_THREAD_VERSION=4;NDEBUG;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>
-      </PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PreprocessorDefinitions>GLEW_BUILD;NOMINMAX;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_THREAD_VERSION=4;NDEBUG;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
       <AdditionalIncludeDirectories>..\..\..\..\ext\boost\include;..\..\..\..\ext\SFML\include;..\..\..\..\ext\tbb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <FloatingPointModel>Strict</FloatingPointModel>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
-      <DisableSpecificWarnings>4100;4127;4191;4242;4265;4365;4371;4373;4514;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4061;4127;4191;4242;4265;4365;4371;4373;4464;4514;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027;5031</DisableSpecificWarnings>
+      <EnablePREfast>false</EnablePREfast>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <ShowIncludes>false</ShowIncludes>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\ext\boost\lib;$(SolutionDir)..\..\..\ext\SFML\lib;$(SolutionDir)..\..\..\ext\tbb\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>sfml-graphics.lib;sfml-audio.lib;sfml-window.lib;sfml-system.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <SubSystem>Windows</SubSystem>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <Image Include="..\..\..\..\src\windows\HourglassII.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\..\src\windows\resource.rc" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\Ability.h" />
     <ClInclude Include="..\..\..\..\src\ArrivalLocation.h" />
@@ -430,12 +440,6 @@
     <ClCompile Include="..\..\..\..\src\variant_test.cpp" />
     <ClCompile Include="..\..\..\..\src\WorldState.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\..\..\..\src\windows\HourglassII.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\..\src\windows\resource.rc" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/ide/msvc2015/HourglassII/HourglassIIUnity/HourglassIIUnity.vcxproj b/ide/msvc2015/HourglassII/HourglassIIUnity/HourglassIIUnity.vcxproj
index 98331c9b..25c31a57 100644
--- a/ide/msvc2015/HourglassII/HourglassIIUnity/HourglassIIUnity.vcxproj
+++ b/ide/msvc2015/HourglassII/HourglassIIUnity/HourglassIIUnity.vcxproj
@@ -32,8 +32,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -42,19 +40,20 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>GLEW_BUILD;NOMINMAX;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_THREAD_VERSION=4;_DEBUG;_WINDOWS;_UNICODE%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <AdditionalIncludeDirectories>..\..\..\..\ext\boost\include;..\..\..\..\ext\SFML\include;..\..\..\..\ext\tbb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -62,12 +61,13 @@
       <FloatingPointModel>Strict</FloatingPointModel>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
-      <DisableSpecificWarnings>4100;4127;4191;4242;4265;4365;4371;4373;4514;4548;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4061;4127;4191;4242;4265;4365;4371;4373;4464;4514;4548;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027;5031</DisableSpecificWarnings>
       <EnablePREfast>false</EnablePREfast>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <ShowIncludes>false</ShowIncludes>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -85,6 +85,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PreprocessorDefinitions>GLEW_BUILD;NOMINMAX;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_THREAD_VERSION=4;NDEBUG;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
@@ -94,11 +95,12 @@
       <FloatingPointModel>Strict</FloatingPointModel>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
-      <DisableSpecificWarnings>4100;4127;4191;4242;4265;4365;4371;4373;4514;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4061;4127;4191;4242;4265;4365;4371;4373;4464;4514;4571;4574;4619;4623;4625;4626;4647;4668;4710;4711;4800;4820;4886;4913;5026;5027;5031</DisableSpecificWarnings>
       <EnablePREfast>false</EnablePREfast>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <ShowIncludes>false</ShowIncludes>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,7 +108,9 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\ext\boost\lib;$(SolutionDir)..\..\..\ext\SFML\lib;$(SolutionDir)..\..\..\ext\tbb\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>sfml-graphics.lib;sfml-audio.lib;sfml-window.lib;sfml-system.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
       <SubSystem>Windows</SubSystem>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -115,6 +119,192 @@
   <ItemGroup>
     <ResourceCompile Include="..\..\..\..\src\windows\resource.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\Ability.h" />
+    <ClInclude Include="..\..\..\..\src\ArrivalLocation.h" />
+    <ClInclude Include="..\..\..\..\src\as_lvalue.h" />
+    <ClInclude Include="..\..\..\..\src\AttachmentMap.h" />
+    <ClInclude Include="..\..\..\..\src\AudioGlitz.h" />
+    <ClInclude Include="..\..\..\..\src\AudioGlitzManager.h" />
+    <ClInclude Include="..\..\..\..\src\Box.h" />
+    <ClInclude Include="..\..\..\..\src\BoxGlitzAdder.h" />
+    <ClInclude Include="..\..\..\..\src\Canvas.h" />
+    <ClInclude Include="..\..\..\..\src\clone_ptr.h" />
+    <ClInclude Include="..\..\..\..\src\Collision.h" />
+    <ClInclude Include="..\..\..\..\src\CommonTriggerCode.h" />
+    <ClInclude Include="..\..\..\..\src\ConcurrentFrameUpdateSet.h" />
+    <ClInclude Include="..\..\..\..\src\ConcurrentQueue.h" />
+    <ClInclude Include="..\..\..\..\src\ConcurrentTimeMap.h" />
+    <ClInclude Include="..\..\..\..\src\ConcurrentTimeSet.h" />
+    <ClInclude Include="..\..\..\..\src\ConstPtr_of.h" />
+    <ClInclude Include="..\..\..\..\src\ConstPtr_of_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\default_clone.h" />
+    <ClInclude Include="..\..\..\..\src\default_delete.h" />
+    <ClInclude Include="..\..\..\..\src\default_memory_source.h" />
+    <ClInclude Include="..\..\..\..\src\DepartureMap.h" />
+    <ClInclude Include="..\..\..\..\src\DepartureMap_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\DirectLuaTriggerSystem.h" />
+    <ClInclude Include="..\..\..\..\src\enqueue_task.h" />
+    <ClInclude Include="..\..\..\..\src\Environment.h" />
+    <ClInclude Include="..\..\..\..\src\FacingDirection.h" />
+    <ClInclude Include="..\..\..\..\src\Foreach.h" />
+    <ClInclude Include="..\..\..\..\src\forward.h" />
+    <ClInclude Include="..\..\..\..\src\Frame.h" />
+    <ClInclude Include="..\..\..\..\src\FrameID.h" />
+    <ClInclude Include="..\..\..\..\src\FrameID_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\FrameUpdateSet.h" />
+    <ClInclude Include="..\..\..\..\src\FrameUpdateSet_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\FrameView.h" />
+    <ClInclude Include="..\..\..\..\src\Frame_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\GameDisplayHelpers.h" />
+    <ClInclude Include="..\..\..\..\src\Geometry.h" />
+    <ClInclude Include="..\..\..\..\src\Glitz.h" />
+    <ClInclude Include="..\..\..\..\src\GlitzImplementation.h" />
+    <ClInclude Include="..\..\..\..\src\GlitzPersister.h" />
+    <ClInclude Include="..\..\..\..\src\GlobalOptions.h" />
+    <ClInclude Include="..\..\..\..\src\GL\glew.h" />
+    <ClInclude Include="..\..\..\..\src\GL\glxew.h" />
+    <ClInclude Include="..\..\..\..\src\GL\wglew.h" />
+    <ClInclude Include="..\..\..\..\src\Guy.h" />
+    <ClInclude Include="..\..\..\..\src\GuyGlitzAdder.h" />
+    <ClInclude Include="..\..\..\..\src\GuyOutputInfo.h" />
+    <ClInclude Include="..\..\..\..\src\Hg_Input.h" />
+    <ClInclude Include="..\..\..\..\src\ImageGlitz.h" />
+    <ClInclude Include="..\..\..\..\src\Inertia.h" />
+    <ClInclude Include="..\..\..\..\src\IngameMenuScene.h" />
+    <ClInclude Include="..\..\..\..\src\InitialBox.h" />
+    <ClInclude Include="..\..\..\..\src\InitialGuy.h" />
+    <ClInclude Include="..\..\..\..\src\InitialGuyArrival.h" />
+    <ClInclude Include="..\..\..\..\src\InitialObjects.h" />
+    <ClInclude Include="..\..\..\..\src\InitialScene.h" />
+    <ClInclude Include="..\..\..\..\src\InputList.h" />
+    <ClInclude Include="..\..\..\..\src\InputList_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\integer_sequence.h" />
+    <ClInclude Include="..\..\..\..\src\InvalidLevelException.h" />
+    <ClInclude Include="..\..\..\..\src\LayeredCanvas.h" />
+    <ClInclude Include="..\..\..\..\src\Level.h" />
+    <ClInclude Include="..\..\..\..\src\LevelLoader.h" />
+    <ClInclude Include="..\..\..\..\src\LevelSelectionScene.h" />
+    <ClInclude Include="..\..\..\..\src\Level_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\LineGlitz.h" />
+    <ClInclude Include="..\..\..\..\src\LoadedLevel.h" />
+    <ClInclude Include="..\..\..\..\src\LoadingLevelScene.h" />
+    <ClInclude Include="..\..\..\..\src\LuaError.h" />
+    <ClInclude Include="..\..\..\..\src\LuaInterruption.h" />
+    <ClInclude Include="..\..\..\..\src\LuaModule.h" />
+    <ClInclude Include="..\..\..\..\src\LuaSandbox.h" />
+    <ClInclude Include="..\..\..\..\src\LuaStackManager.h" />
+    <ClInclude Include="..\..\..\..\src\LuaUserData.h" />
+    <ClInclude Include="..\..\..\..\src\LuaUtilities.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lapi.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lauxlib.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lcode.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lctype.h" />
+    <ClInclude Include="..\..\..\..\src\lua\ldebug.h" />
+    <ClInclude Include="..\..\..\..\src\lua\ldo.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lfunc.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lgc.h" />
+    <ClInclude Include="..\..\..\..\src\lua\llex.h" />
+    <ClInclude Include="..\..\..\..\src\lua\llimits.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lmem.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lobject.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lopcodes.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lparser.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lprefix.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lstate.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lstring.h" />
+    <ClInclude Include="..\..\..\..\src\lua\ltable.h" />
+    <ClInclude Include="..\..\..\..\src\lua\ltm.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lua.h" />
+    <ClInclude Include="..\..\..\..\src\lua\luaconf.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lualib.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lundump.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lvm.h" />
+    <ClInclude Include="..\..\..\..\src\lua\lzio.h" />
+    <ClInclude Include="..\..\..\..\src\MainMenuScene.h" />
+    <ClInclude Include="..\..\..\..\src\Maths.h" />
+    <ClInclude Include="..\..\..\..\src\memory_source_clone.h" />
+    <ClInclude Include="..\..\..\..\src\move.h" />
+    <ClInclude Include="..\..\..\..\src\move_function.h" />
+    <ClInclude Include="..\..\..\..\src\mt\boost\container\map.hpp" />
+    <ClInclude Include="..\..\..\..\src\mt\boost\container\stable_vector.hpp" />
+    <ClInclude Include="..\..\..\..\src\mt\boost\container\vector.hpp" />
+    <ClInclude Include="..\..\..\..\src\mt\boost\unordered_map.hpp" />
+    <ClInclude Include="..\..\..\..\src\multi_array.h" />
+    <ClInclude Include="..\..\..\..\src\multi_thread_allocator.h" />
+    <ClInclude Include="..\..\..\..\src\multi_thread_deleter.h" />
+    <ClInclude Include="..\..\..\..\src\multi_thread_memory_source.h" />
+    <ClInclude Include="..\..\..\..\src\multi_vector.h" />
+    <ClInclude Include="..\..\..\..\src\MutatorArea.h" />
+    <ClInclude Include="..\..\..\..\src\natural_sort.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectAndTime.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectList.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectListHelpers.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectListTypes.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectList_def.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectList_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectPtrList.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectPtrList_def.h" />
+    <ClInclude Include="..\..\..\..\src\ObjectPtrList_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\OperationInterruptedException.h" />
+    <ClInclude Include="..\..\..\..\src\OperationInterrupter.h" />
+    <ClInclude Include="..\..\..\..\src\ParallelForEach.h" />
+    <ClInclude Include="..\..\..\..\src\PhysicsAffectingStuff.h" />
+    <ClInclude Include="..\..\..\..\src\PhysicsEngine.h" />
+    <ClInclude Include="..\..\..\..\src\PhysicsEngineUtilities.h" />
+    <ClInclude Include="..\..\..\..\src\PhysicsEngineUtilities_def.h" />
+    <ClInclude Include="..\..\..\..\src\PhysicsObjectType.h" />
+    <ClInclude Include="..\..\..\..\src\PlayerVictoryException.h" />
+    <ClInclude Include="..\..\..\..\src\PortalArea.h" />
+    <ClInclude Include="..\..\..\..\src\PostLevelScene.h" />
+    <ClInclude Include="..\..\..\..\src\prettyprint.hpp" />
+    <ClInclude Include="..\..\..\..\src\prettyprint98.hpp" />
+    <ClInclude Include="..\..\..\..\src\RectangleGlitz.h" />
+    <ClInclude Include="..\..\..\..\src\RenderWindow.h" />
+    <ClInclude Include="..\..\..\..\src\ReplayIO.h" />
+    <ClInclude Include="..\..\..\..\src\ReplaySelectionScene.h" />
+    <ClInclude Include="..\..\..\..\src\ResourceManager.h" />
+    <ClInclude Include="..\..\..\..\src\RunningGameScene.h" />
+    <ClInclude Include="..\..\..\..\src\RuntimeErrorScene.h" />
+    <ClInclude Include="..\..\..\..\src\scalable_allocator.h" />
+    <ClInclude Include="..\..\..\..\src\Scene.h" />
+    <ClInclude Include="..\..\..\..\src\SelectionScene.h" />
+    <ClInclude Include="..\..\..\..\src\sfColour.h" />
+    <ClInclude Include="..\..\..\..\src\sfRenderTargetCanvas.h" />
+    <ClInclude Include="..\..\..\..\src\SimpleLuaCpp.h" />
+    <ClInclude Include="..\..\..\..\src\SortWeakerThanEquality.h" />
+    <ClInclude Include="..\..\..\..\src\SortWeakerThanEquality_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\StdHashCompare.h" />
+    <ClInclude Include="..\..\..\..\src\TestDriver.h" />
+    <ClInclude Include="..\..\..\..\src\TextGlitz.h" />
+    <ClInclude Include="..\..\..\..\src\ThreadLocal.h" />
+    <ClInclude Include="..\..\..\..\src\TimeDirection.h" />
+    <ClInclude Include="..\..\..\..\src\TimeEngine.h" />
+    <ClInclude Include="..\..\..\..\src\TimelineState.h" />
+    <ClInclude Include="..\..\..\..\src\TriggerData.h" />
+    <ClInclude Include="..\..\..\..\src\TriggerOffsetsAndDefaults.h" />
+    <ClInclude Include="..\..\..\..\src\TriggerSystem.h" />
+    <ClInclude Include="..\..\..\..\src\TriggerSystemImplementation.h" />
+    <ClInclude Include="..\..\..\..\src\unique_ptr.h" />
+    <ClInclude Include="..\..\..\..\src\Universe.h" />
+    <ClInclude Include="..\..\..\..\src\UniverseID.h" />
+    <ClInclude Include="..\..\..\..\src\UniverseID_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\Universe_fwd.h" />
+    <ClInclude Include="..\..\..\..\src\UserDataProxyTable.h" />
+    <ClInclude Include="..\..\..\..\src\variant.h" />
+    <ClInclude Include="..\..\..\..\src\vector2.h" />
+    <ClInclude Include="..\..\..\..\src\VectorOf.h" />
+    <ClInclude Include="..\..\..\..\src\WorldState.h" />
+    <ClInclude Include="..\..\..\..\src\mt\std\map">
+      <FileType>CppHeader</FileType>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mt\std\set">
+      <FileType>CppHeader</FileType>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mt\std\vector">
+      <FileType>CppHeader</FileType>
+    </ClInclude>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\unitysrc\FrontEnd.cpp" />
     <ClCompile Include="..\..\..\..\unitysrc\glew.cpp" />

From a05d0020ca2f0f0a68503242daf8a2dfb96c9eaf Mon Sep 17 00:00:00 2001
From: Evan Wallace <onlyone@senet.com.au>
Date: Sun, 13 Dec 2015 19:37:08 +1100
Subject: [PATCH 2/3] Added *.VC.opendb to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bff70042..b555466a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /ide/msvc2015/HourglassII/HourglassII/x64
 /ide/msvc2015/HourglassII/HourglassIIUnity/x64
 
+*.VC.opendb
 *.vcxproj.user
 *.vs
 *.sdf

From 157818d5913550ab6b8633040a8b0e5c5810ce53 Mon Sep 17 00:00:00 2001
From: Evan Wallace <onlyone@senet.com.au>
Date: Sun, 13 Dec 2015 19:39:08 +1100
Subject: [PATCH 3/3] More warning elimination

---
 src/SimpleLuaCpp.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/SimpleLuaCpp.h b/src/SimpleLuaCpp.h
index ead7baec..ca3c412d 100644
--- a/src/SimpleLuaCpp.h
+++ b/src/SimpleLuaCpp.h
@@ -11,6 +11,11 @@
 #include <thread>
 #include <boost/throw_exception.hpp>
 namespace hg {
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4646) //[[noreturn]] declared with return type. Justified because `panic` has to be a lua_Cfunction, which returns int.
+#endif
 [[noreturn]] inline int panic(lua_State *L) {
     //Check whether this is a memory allocation error
     LuaUserData &ud(getUserData(L));
@@ -24,6 +29,9 @@ namespace hg {
         boost::throw_exception(LuaError(L));
     }
 }
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 //RAII class for lua_State.
 //Movable but non-copyable, as I do not know