From 05e3b710fc0be69899fc375eec9538be1d1dd155 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 4 Dec 2017 15:15:49 +0100
Subject: [PATCH] Fix build with Visual Studio 2017.

---
 build/msbuild/lol.rules.props   | 33 ++++++++++++++++++---
 src/3rdparty/README.md          |  4 +--
 src/3rdparty/lol-bullet.vcxproj | 52 ++++++++++++++++-----------------
 3 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/build/msbuild/lol.rules.props b/build/msbuild/lol.rules.props
index 1fa2a528..5f277e55 100644
--- a/build/msbuild/lol.rules.props
+++ b/build/msbuild/lol.rules.props
@@ -8,6 +8,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
 
+      <!-- Use latest version of the C++ draft -->
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+
       <!-- Always multiprocessor, never minimal rebuild -->
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -15,10 +18,32 @@
       <!-- We should use %(RelativeDir) here but for some reason it's an _absolute_ dir. WTF. -->
       <ObjectFileName>$(IntDir)/%(Directory)/</ObjectFileName>
 
-      <AdditionalIncludeDirectories>$(LolDir)\src;$(LolDir)\src\3rdparty\bullet3\src;$(LolDir)\tools\lolunit;$(PegtlIncludes);$(ImguiIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(FfmpegIncludes);$(AssimpIncludes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(FfmpegIncludes);$(AssimpIncludes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>
+          $(LolDir)\src;
+          $(LolDir)\src\3rdparty\bullet3\src;
+          $(LolDir)\tools\lolunit;
+          $(PegtlIncludes);
+          $(ImguiIncludes);
+          $(BtPhysIncludes);
+          %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+
+      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
+          $(GlIncludes);
+          $(SdlIncludes);
+          $(FfmpegIncludes);
+          $(AssimpIncludes);
+          $(XinputIncludes);
+          %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+
+      <PreprocessorDefinitions>
+          NOMINMAX;
+          _CRT_SECURE_NO_WARNINGS;
+          B3_USE_CLEW;
+          LUA_ANSI;
+          %(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
 
       <!-- Escape backslashes for C++, but replace \ with / on the PS4
            because the SCE VSI seems to have trouble with backslashes -->
diff --git a/src/3rdparty/README.md b/src/3rdparty/README.md
index 0b38d51a..27beee1e 100644
--- a/src/3rdparty/README.md
+++ b/src/3rdparty/README.md
@@ -4,6 +4,6 @@ Generate vcxproj for Bullet:
     cat lol-bullet.am | \
         awk '/bullet_source/ { print "  <ItemGroup>" } \
              /NULL/ { print "  </ItemGroup>" } \
-             /bullet3.*\.c/ { print "    <ClCompile Include=\""$1"\" />" } \
-             /bullet3.*\.h/ { print "    <ClInclude Include=\""$1"\" />" }'
+             /bullet3.*\.(c|cpp)\>/ { print "    <ClCompile Include=\""$1"\" />" } \
+             /bullet3.*\.(h|hpp|cl)\>/ { print "    <ClInclude Include=\""$1"\" />" }'
 
diff --git a/src/3rdparty/lol-bullet.vcxproj b/src/3rdparty/lol-bullet.vcxproj
index acf5d64d..99575381 100644
--- a/src/3rdparty/lol-bullet.vcxproj
+++ b/src/3rdparty/lol-bullet.vcxproj
@@ -166,11 +166,11 @@
     <ClCompile Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.h" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLInclude.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp" />
@@ -199,16 +199,16 @@
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VectorFloat4.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.cpp" />
@@ -225,21 +225,21 @@
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernelsCL.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsFloat4CL.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.h" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/b3GpuConstraint4.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.cpp" />
@@ -260,25 +260,25 @@
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl" />
+    <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h" />
   </ItemGroup>
   <ItemGroup>