diff --git a/CMakeLists.txt b/CMakeLists.txt index 0734ef9..5ee2cbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -376,6 +376,7 @@ ExternalProject_Add(jolt CMAKE_ARGS ${CUSTOM_OPTS} -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DCPP_RTTI_ENABLED=ON -DDEBUG_RENDERER_IN_DISTRIBUTION=ON -DJPH_USE_DX12=OFF -DJPH_USE_DXC=OFF -DJPH_USE_VK=OFF -DJPH_USE_MTL=OFF -DJPH_USE_CPU_COMPUTE=OFF -DDOUBLE_PRECISION=ON -DPROFILER_IN_DISTRIBUTION=ON + -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_FLAGS=-Wno-error=attributes ) ExternalProject_Add(jolt-static @@ -383,6 +384,7 @@ ExternalProject_Add(jolt-static CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug -DCPP_RTTI_ENABLED=ON -DDEBUG_RENDERER_IN_DISTRIBUTION=ON -DJPH_USE_DX12=OFF -DJPH_USE_DXC=OFF -DJPH_USE_VK=OFF -DJPH_USE_MTL=OFF -DJPH_USE_CPU_COMPUTE=OFF -DDOUBLE_PRECISION=ON -DPROFILER_IN_DISTRIBUTION=ON + -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_FLAGS=-Wno-error=attributes ) ExternalProject_Add(json diff --git a/assimp b/assimp index fcb1702..2ffbe3c 160000 --- a/assimp +++ b/assimp @@ -1 +1 @@ -Subproject commit fcb1702162c044976d01e74162cb4fadb3f335de +Subproject commit 2ffbe3c13dfef534fc04f9bf14d117f7c0e9dac0 diff --git a/flecs b/flecs index a7293a9..4201e24 160000 --- a/flecs +++ b/flecs @@ -1 +1 @@ -Subproject commit a7293a9455f2a5feffa2642f43bc670c06b03558 +Subproject commit 4201e2477fad5e600c177192eaae10895b073fbf diff --git a/jolt b/jolt index f8a329a..c581b5f 160000 --- a/jolt +++ b/jolt @@ -1 +1 @@ -Subproject commit f8a329a6406d961349bc86dc477512e55358cebe +Subproject commit c581b5f03d4f59e6662c1b87a0af52619ca65c83 diff --git a/ogre b/ogre index f5dc58a..90285a5 160000 --- a/ogre +++ b/ogre @@ -1 +1 @@ -Subproject commit f5dc58a742375296ba89a15fedbd48e9a238cfa7 +Subproject commit 90285a51fb37d0b93471c4cbb378c1b1577a3dc5 diff --git a/ogre-projects/world2 b/ogre-projects/world2 index 0bd98ea..a553621 160000 --- a/ogre-projects/world2 +++ b/ogre-projects/world2 @@ -1 +1 @@ -Subproject commit 0bd98ea3e25d58c9672eb0a533fc46211768c3f5 +Subproject commit a553621c7f30b6678959e404d0450f3c3f18b879