From f12565341d8417c22e18f3a3ef853db1b3fef509 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 19 Jun 2020 14:16:52 +0200 Subject: [PATCH] Update all 3rd party submodules. --- .gitignore | 1 + build/autotools/m4/lol-conf.m4 | 2 +- build/msbuild/lol.vars.props | 1 + src/3rdparty/bullet3 | 2 +- src/3rdparty/cpp-httplib | 2 +- src/3rdparty/imgui | 2 +- src/3rdparty/lua | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 61a66690..83d1780c 100644 --- a/.gitignore +++ b/.gitignore @@ -121,6 +121,7 @@ doc/tutorial/14_lua doc/tutorial/15_gui doc/tutorial/16_movie doc/tutorial/16_movie.gif +doc/tutorial/17_net tools/make-font # Our data doc/doxygen.cfg diff --git a/build/autotools/m4/lol-conf.m4 b/build/autotools/m4/lol-conf.m4 index e03f2b6e..d8d49922 100644 --- a/build/autotools/m4/lol-conf.m4 +++ b/build/autotools/m4/lol-conf.m4 @@ -68,7 +68,7 @@ dnl Activate some header-only libraries dnl LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/cpp-httplib" -LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/imgui" +LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/imgui -DIMGUI_USE_WCHAR32" dnl Use OpenSSL? diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props index ee4bc628..1f02b517 100644 --- a/build/msbuild/lol.vars.props +++ b/build/msbuild/lol.vars.props @@ -11,6 +11,7 @@ $(LolDir)\src\3rdparty\imgui $(ImguiDir) + IMGUI_USE_WCHAR32;$(Win32Defines) $(ExternalDir)\openssl-1.1.1g diff --git a/src/3rdparty/bullet3 b/src/3rdparty/bullet3 index ce28bd53..036e51c6 160000 --- a/src/3rdparty/bullet3 +++ b/src/3rdparty/bullet3 @@ -1 +1 @@ -Subproject commit ce28bd5369586cfce95885f7f99e421aa2384cd7 +Subproject commit 036e51c63725a805f11208b15492570ca608306e diff --git a/src/3rdparty/cpp-httplib b/src/3rdparty/cpp-httplib index b2516685..6b224092 160000 --- a/src/3rdparty/cpp-httplib +++ b/src/3rdparty/cpp-httplib @@ -1 +1 @@ -Subproject commit b251668522dd459d2c6a75c10390a11b640be708 +Subproject commit 6b22409217e58b81271c1d50f88265481d042fa8 diff --git a/src/3rdparty/imgui b/src/3rdparty/imgui index 4ebf5257..6b242e11 160000 --- a/src/3rdparty/imgui +++ b/src/3rdparty/imgui @@ -1 +1 @@ -Subproject commit 4ebf525785e22f3d96433cb4d070e890ef819190 +Subproject commit 6b242e119ee92d9dd88fdcdb057288cd06f933ef diff --git a/src/3rdparty/lua b/src/3rdparty/lua index 1653f339..463f4cad 160000 --- a/src/3rdparty/lua +++ b/src/3rdparty/lua @@ -1 +1 @@ -Subproject commit 1653f339db1c7cc63b20782732a4788f077c94f0 +Subproject commit 463f4cad03a78989bda941d01d8a6c3f86ee5bc4