Update 3rd party modules and fix build.

bullet3, pegtl: update upstream branches.
imgui: add missing files in “make dist”.

src/3rdparty/Makefile.am

@@ -28,7 +28,9 @@ EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources)
 EXTRA_DIST += lol-bullet.vcxproj lol-bullet.vcxproj.filters
 EXTRA_DIST += lol-lua.vcxproj lol-lua.vcxproj.filters
 
-include lol-imgui.am
 include lol-mingw-std-threads.am
 include lol-pegtl.am
 
+# XXX: this is included by the parent Makefile instead
+#include lol-imgui.am
+

src/3rdparty/bullet3

@@ -1 +1 @@
-Subproject commit 764822241e8d363830d8b9fa7c61393bc5066e6b
+Subproject commit 4a404128cbfd525cef1ab8754d22f05f662714d6

src/3rdparty/lol-bullet.am

@@ -130,8 +130,6 @@ bullet_sources += \
 	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h \
 	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp \
 	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h \
-	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.cpp \
-	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.h \
 	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp \
 	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h \
 	bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp \
@@ -362,6 +360,8 @@ bullet_sources += \
 	bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp \
 	bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h \
 	bullet3/src/BulletCollision/CollisionShapes/btMaterial.h \
+	bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.cpp \
+	bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.h \
 	bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp \
 	bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h \
 	bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp \
@@ -374,6 +374,8 @@ bullet_sources += \
 	bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h \
 	bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp \
 	bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h \
+	bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp \
+	bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h \
 	bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp \
 	bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h \
 	bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp \
@@ -481,6 +483,8 @@ bullet_sources += \
 	bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h \
 	bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp \
 	bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h \
+	bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp \
+	bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h \
 	bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp \
 	bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \
 	bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h \
@@ -508,6 +512,8 @@ bullet_sources += \
 	bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h \
 	bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp \
 	bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h \
+	bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp \
+	bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h \
 	bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp \
 	bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h \
 	bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp \

src/3rdparty/lol-bullet.vcxproj

@@ -183,8 +183,6 @@
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h" />
-    <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.cpp" />
-    <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp" />
     <ClInclude Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h" />
     <ClCompile Include="bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp" />
@@ -413,6 +411,8 @@
     <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp" />
     <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h" />
     <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMaterial.h" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.cpp" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.h" />
     <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp" />
     <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h" />
     <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp" />
@@ -425,6 +425,8 @@
     <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" />
     <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp" />
     <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" />
+    <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp" />
+    <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h" />
     <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp" />
     <ClInclude Include="bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h" />
     <ClCompile Include="bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp" />
@@ -531,6 +533,8 @@
     <ClInclude Include="bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h" />
     <ClCompile Include="bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp" />
     <ClInclude Include="bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h" />
     <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp" />
     <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h" />
     <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h" />
@@ -558,6 +562,8 @@
     <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" />
     <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp" />
     <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" />
+    <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp" />
+    <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h" />
     <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp" />
     <ClInclude Include="bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h" />
     <ClCompile Include="bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp" />

src/3rdparty/lol-imgui.am

@@ -1,12 +1,16 @@
 
+# This is included by the parent Makefile because we build it
+# directly in the lol-core library, hence the 3rdparty/ paths.
 imgui_sources = \
-    imgui/imconfig.h \
-    imgui/imgui.cpp \
-    imgui/imgui_widgets.cpp \
-    imgui/imgui.h \
-    imgui/imgui_internal.h \
-    imgui/stb_rect_pack.h \
-    imgui/stb_textedit.h \
-    imgui/stb_truetype.h \
+    3rdparty/imgui/imconfig.h \
+    3rdparty/imgui/imgui.cpp \
+    3rdparty/imgui/imgui_demo.cpp \
+    3rdparty/imgui/imgui_draw.cpp \
+    3rdparty/imgui/imgui_widgets.cpp \
+    3rdparty/imgui/imgui.h \
+    3rdparty/imgui/imgui_internal.h \
+    3rdparty/imgui/imstb_rectpack.h \
+    3rdparty/imgui/imstb_textedit.h \
+    3rdparty/imgui/imstb_truetype.h \
     $(NULL)
 

src/3rdparty/lol-pegtl.am

@@ -28,6 +28,7 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/contrib/uri.hpp \
     pegtl/include/tao/pegtl/cstream_input.hpp \
     pegtl/include/tao/pegtl/eol.hpp \
+    pegtl/include/tao/pegtl/eol_pair.hpp \
     pegtl/include/tao/pegtl/file_input.hpp \
     pegtl/include/tao/pegtl.hpp \
     pegtl/include/tao/pegtl/input_error.hpp \
@@ -36,7 +37,9 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/internal/alnum.hpp \
     pegtl/include/tao/pegtl/internal/alpha.hpp \
     pegtl/include/tao/pegtl/internal/any.hpp \
+    pegtl/include/tao/pegtl/internal/apply0_single.hpp \
     pegtl/include/tao/pegtl/internal/apply0.hpp \
+    pegtl/include/tao/pegtl/internal/apply_single.hpp \
     pegtl/include/tao/pegtl/internal/apply.hpp \
     pegtl/include/tao/pegtl/internal/at.hpp \
     pegtl/include/tao/pegtl/internal/bof.hpp \
@@ -59,13 +62,17 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/internal/dusel_mode.hpp \
     pegtl/include/tao/pegtl/internal/duseltronik.hpp \
     pegtl/include/tao/pegtl/internal/enable.hpp \
+    pegtl/include/tao/pegtl/internal/endian.hpp \
+    pegtl/include/tao/pegtl/internal/endian_gcc.hpp \
     pegtl/include/tao/pegtl/internal/eof.hpp \
     pegtl/include/tao/pegtl/internal/eolf.hpp \
     pegtl/include/tao/pegtl/internal/eol.hpp \
-    pegtl/include/tao/pegtl/internal/file_mapper.hpp \
+    pegtl/include/tao/pegtl/internal/file_mapper_posix.hpp \
+    pegtl/include/tao/pegtl/internal/file_mapper_win32.hpp \
     pegtl/include/tao/pegtl/internal/file_opener.hpp \
     pegtl/include/tao/pegtl/internal/file_reader.hpp \
     pegtl/include/tao/pegtl/internal/has_apply0.hpp \
+    pegtl/include/tao/pegtl/internal/has_apply.hpp \
     pegtl/include/tao/pegtl/internal/identifier.hpp \
     pegtl/include/tao/pegtl/internal/if_apply.hpp \
     pegtl/include/tao/pegtl/internal/if_must_else.hpp \
@@ -91,6 +98,10 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/internal/pad.hpp \
     pegtl/include/tao/pegtl/internal/pad_opt.hpp \
     pegtl/include/tao/pegtl/internal/peek_char.hpp \
+    pegtl/include/tao/pegtl/internal/peek_mask_uint8.hpp \
+    pegtl/include/tao/pegtl/internal/peek_mask_uint.hpp \
+    pegtl/include/tao/pegtl/internal/peek_uint8.hpp \
+    pegtl/include/tao/pegtl/internal/peek_uint.hpp \
     pegtl/include/tao/pegtl/internal/peek_utf16.hpp \
     pegtl/include/tao/pegtl/internal/peek_utf32.hpp \
     pegtl/include/tao/pegtl/internal/peek_utf8.hpp \
@@ -99,6 +110,7 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/internal/raise.hpp \
     pegtl/include/tao/pegtl/internal/range.hpp \
     pegtl/include/tao/pegtl/internal/ranges.hpp \
+    pegtl/include/tao/pegtl/internal/read_uint.hpp \
     pegtl/include/tao/pegtl/internal/rep.hpp \
     pegtl/include/tao/pegtl/internal/rep_min.hpp \
     pegtl/include/tao/pegtl/internal/rep_min_max.hpp \
@@ -114,8 +126,10 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/internal/star_must.hpp \
     pegtl/include/tao/pegtl/internal/state.hpp \
     pegtl/include/tao/pegtl/internal/string.hpp \
+    pegtl/include/tao/pegtl/internal/three.hpp \
     pegtl/include/tao/pegtl/internal/trivial.hpp \
     pegtl/include/tao/pegtl/internal/try_catch_type.hpp \
+    pegtl/include/tao/pegtl/internal/two.hpp \
     pegtl/include/tao/pegtl/internal/until.hpp \
     pegtl/include/tao/pegtl/istream_input.hpp \
     pegtl/include/tao/pegtl/memory_input.hpp \
@@ -130,6 +144,10 @@ pegtl_sources = \
     pegtl/include/tao/pegtl/rules.hpp \
     pegtl/include/tao/pegtl/string_input.hpp \
     pegtl/include/tao/pegtl/tracking_mode.hpp \
+    pegtl/include/tao/pegtl/uint16.hpp \
+    pegtl/include/tao/pegtl/uint32.hpp \
+    pegtl/include/tao/pegtl/uint64.hpp \
+    pegtl/include/tao/pegtl/uint8.hpp \
     pegtl/include/tao/pegtl/utf16.hpp \
     pegtl/include/tao/pegtl/utf32.hpp \
     pegtl/include/tao/pegtl/utf8.hpp \

src/3rdparty/pegtl

@@ -1 +1 @@
-Subproject commit 4c1c88bb0b9ea4ffd7de8c3af943b507e366cd15
+Subproject commit 0a5ab8c8efb421f00d9b0e3f593c971991888a97

src/Makefile.am

@@ -151,11 +151,10 @@ endif
 d3d9_sources = \
     platform/d3d9/d3d9input.cpp platform/d3d9/d3d9input.h
 
-imgui_sources = \
+include 3rdparty/lol-imgui.am
+
+imgui_sources += \
     lolimgui.cpp lolimgui.h \
-    3rdparty/imgui/imgui_demo.cpp \
-    3rdparty/imgui/imgui_draw.cpp \
-    3rdparty/imgui/imgui_widgets.cpp \
     $(NULL)
 
 if LOL_USE_NACL

src/lolimgui.cpp

@@ -13,7 +13,7 @@
 
 #include <lol/engine-internal.h>
 
-#include "imgui.cpp"
+#include "imgui_internal.h" // needed for GImGui in GetMainMenuBarHeight()
 
 #include <cstdio>
 #include <string>