From b8eefc1d022d82998da26e04ee734e812c5b9458 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 17 Sep 2019 07:27:36 +0200 Subject: [PATCH] Update all 3rd party submodules. --- src/3rdparty/bullet3 | 2 +- src/3rdparty/imgui | 2 +- src/3rdparty/lol-bullet.vcxproj | 23 ++++++++++++++++++++++ src/3rdparty/lol-mingw-std-threads.am | 3 +++ src/3rdparty/lol-pegtl.am | 28 +++++++++++++-------------- src/3rdparty/lua | 2 +- src/3rdparty/mingw-std-threads | 2 +- src/3rdparty/pegtl | 2 +- 8 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/3rdparty/bullet3 b/src/3rdparty/bullet3 index c993175a..ce28bd53 160000 --- a/src/3rdparty/bullet3 +++ b/src/3rdparty/bullet3 @@ -1 +1 @@ -Subproject commit c993175a5859e48783cf2c490947d826be5649b2 +Subproject commit ce28bd5369586cfce95885f7f99e421aa2384cd7 diff --git a/src/3rdparty/imgui b/src/3rdparty/imgui index 9bf6509c..0bdc1453 160000 --- a/src/3rdparty/imgui +++ b/src/3rdparty/imgui @@ -1 +1 @@ -Subproject commit 9bf6509c6ef4ead477e5127f5729a55b971f8a4a +Subproject commit 0bdc1453433ab0bb4d889c72ef9b0353ba3998aa diff --git a/src/3rdparty/lol-bullet.vcxproj b/src/3rdparty/lol-bullet.vcxproj index 26802455..3aa173cf 100644 --- a/src/3rdparty/lol-bullet.vcxproj +++ b/src/3rdparty/lol-bullet.vcxproj @@ -66,8 +66,11 @@ + + + @@ -500,6 +503,7 @@ + @@ -606,6 +610,7 @@ + @@ -655,8 +660,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/3rdparty/lol-mingw-std-threads.am b/src/3rdparty/lol-mingw-std-threads.am index 9c30d5de..e208651d 100644 --- a/src/3rdparty/lol-mingw-std-threads.am +++ b/src/3rdparty/lol-mingw-std-threads.am @@ -1,7 +1,10 @@ mingw_std_threads_sources = \ mingw-std-threads/mingw.condition_variable.h \ + mingw-std-threads/mingw.future.h \ + mingw-std-threads/mingw.invoke.h \ mingw-std-threads/mingw.mutex.h \ + mingw-std-threads/mingw.shared_mutex.h \ mingw-std-threads/mingw.thread.h \ $(NULL) diff --git a/src/3rdparty/lol-pegtl.am b/src/3rdparty/lol-pegtl.am index a0be2260..943eb881 100644 --- a/src/3rdparty/lol-pegtl.am +++ b/src/3rdparty/lol-pegtl.am @@ -13,24 +13,22 @@ pegtl_sources = \ pegtl/include/tao/pegtl/argv_input.hpp \ pegtl/include/tao/pegtl/ascii.hpp \ pegtl/include/tao/pegtl/buffer_input.hpp \ + pegtl/include/tao/pegtl/change_action_and_state.hpp \ + pegtl/include/tao/pegtl/change_action_and_states.hpp \ + pegtl/include/tao/pegtl/change_action.hpp \ + pegtl/include/tao/pegtl/change_control.hpp \ + pegtl/include/tao/pegtl/change_state.hpp \ + pegtl/include/tao/pegtl/change_states.hpp \ pegtl/include/tao/pegtl/config.hpp \ pegtl/include/tao/pegtl/contrib/abnf.hpp \ pegtl/include/tao/pegtl/contrib/alphabet.hpp \ - pegtl/include/tao/pegtl/contrib/change_action_and_state.hpp \ - pegtl/include/tao/pegtl/contrib/change_action_and_states.hpp \ - pegtl/include/tao/pegtl/contrib/change_action.hpp \ - pegtl/include/tao/pegtl/contrib/change_control.hpp \ - pegtl/include/tao/pegtl/contrib/change_state.hpp \ - pegtl/include/tao/pegtl/contrib/change_states.hpp \ pegtl/include/tao/pegtl/contrib/counter.hpp \ - pegtl/include/tao/pegtl/contrib/disable_action.hpp \ - pegtl/include/tao/pegtl/contrib/discard_input.hpp \ - pegtl/include/tao/pegtl/contrib/discard_input_on_failure.hpp \ - pegtl/include/tao/pegtl/contrib/discard_input_on_success.hpp \ - pegtl/include/tao/pegtl/contrib/enable_action.hpp \ pegtl/include/tao/pegtl/contrib/http.hpp \ pegtl/include/tao/pegtl/contrib/json.hpp \ + pegtl/include/tao/pegtl/contrib/json_pointer.hpp \ + pegtl/include/tao/pegtl/contrib/parse_tree_to_dot.hpp \ pegtl/include/tao/pegtl/contrib/raw_string.hpp \ + pegtl/include/tao/pegtl/contrib/remove_first_state.hpp \ pegtl/include/tao/pegtl/contrib/rep_one_min_max.hpp \ pegtl/include/tao/pegtl/contrib/rep_string.hpp \ pegtl/include/tao/pegtl/contrib/to_string.hpp \ @@ -38,6 +36,11 @@ pegtl_sources = \ pegtl/include/tao/pegtl/contrib/unescape.hpp \ pegtl/include/tao/pegtl/contrib/uri.hpp \ pegtl/include/tao/pegtl/cstream_input.hpp \ + pegtl/include/tao/pegtl/disable_action.hpp \ + pegtl/include/tao/pegtl/discard_input.hpp \ + pegtl/include/tao/pegtl/discard_input_on_failure.hpp \ + pegtl/include/tao/pegtl/discard_input_on_success.hpp \ + pegtl/include/tao/pegtl/enable_action.hpp \ pegtl/include/tao/pegtl/eol.hpp \ pegtl/include/tao/pegtl/eol_pair.hpp \ pegtl/include/tao/pegtl/file_input.hpp \ @@ -64,10 +67,7 @@ pegtl_sources = \ pegtl/include/tao/pegtl/internal/crlf_eol.hpp \ pegtl/include/tao/pegtl/internal/cstream_reader.hpp \ pegtl/include/tao/pegtl/internal/cstring_reader.hpp \ - pegtl/include/tao/pegtl/internal/demangle_cxxabi.hpp \ pegtl/include/tao/pegtl/internal/demangle.hpp \ - pegtl/include/tao/pegtl/internal/demangle_nop.hpp \ - pegtl/include/tao/pegtl/internal/demangle_sanitise.hpp \ pegtl/include/tao/pegtl/internal/disable.hpp \ pegtl/include/tao/pegtl/internal/discard.hpp \ pegtl/include/tao/pegtl/internal/dusel_mode.hpp \ diff --git a/src/3rdparty/lua b/src/3rdparty/lua index 76212563..1653f339 160000 --- a/src/3rdparty/lua +++ b/src/3rdparty/lua @@ -1 +1 @@ -Subproject commit 7621256389a8d5a9e7e15933bba3de9ef82f8a11 +Subproject commit 1653f339db1c7cc63b20782732a4788f077c94f0 diff --git a/src/3rdparty/mingw-std-threads b/src/3rdparty/mingw-std-threads index 10665829..86ca7dc8 160000 --- a/src/3rdparty/mingw-std-threads +++ b/src/3rdparty/mingw-std-threads @@ -1 +1 @@ -Subproject commit 10665829daaedc28629e5e9b014fe498c20d73f2 +Subproject commit 86ca7dc89659a556dcd1b6f954ed8f2799e23e2f diff --git a/src/3rdparty/pegtl b/src/3rdparty/pegtl index 00a122c2..2e56b15a 160000 --- a/src/3rdparty/pegtl +++ b/src/3rdparty/pegtl @@ -1 +1 @@ -Subproject commit 00a122c2b06666cf1deab53e8a4926cee974391d +Subproject commit 2e56b15a0711de9f0879dc0bd39f045d82a6f9e3