From 6b2f218c5ca7ec5b9735e85e06381013c79742b3 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Sun, 22 Mar 2026 18:46:36 +0300 Subject: [PATCH] Updated dependencies and versions --- .gitmodules | 4 ++++ CMakeLists.txt | 15 ++++++++++++++- ImGuiColorTextEdit | 1 + assimp | 2 +- jolt | 2 +- ogre | 2 +- ogre-projects/world2 | 2 +- recastnavigation | 2 +- 8 files changed, 24 insertions(+), 6 deletions(-) create mode 160000 ImGuiColorTextEdit diff --git a/.gitmodules b/.gitmodules index 533022a..4c14ca0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -174,3 +174,7 @@ path = tracy url = https://github.com/wolfpld/tracy branch = master +[submodule "ImGuiColorTextEdit"] + path = ImGuiColorTextEdit + url = https://github.com/BalazsJako/ImGuiColorTextEdit + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 7572b17..0734ef9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,10 +296,23 @@ ExternalProject_Add(ogre-static -DASSIMP_BUILD_ASSIMP_TOOLS=ON -DOGRE_STATIC=TRUE ${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug - PATCH_COMMAND ${CMAKE_COMMAND} -E make_directory Dependencies/include/bullet DEPENDS core-deps-static freetype-static assimp-static glslang-static zlib-static ) +ExternalProject_Add_Step(ogre create_build_subdir + COMMAND ${CMAKE_COMMAND} -E make_directory "/Dependencies/include/bullet" + COMMENT "Creating subdirectory inside the external build folder" + DEPENDEES build # Runs after build + DEPENDERS install # Runs before install +) + +ExternalProject_Add_Step(ogre-static create_build_subdir + COMMAND ${CMAKE_COMMAND} -E make_directory "/Dependencies/include/bullet" + COMMENT "Creating subdirectory inside the external build folder" + DEPENDEES build # Runs after build + DEPENDERS install # Runs before install +) + ExternalProject_Add(ogre-procedural SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-procedural CMAKE_ARGS -DOgreProcedural_BUILD_DOCS:BOOL=FALSE diff --git a/ImGuiColorTextEdit b/ImGuiColorTextEdit new file mode 160000 index 0000000..ca2f9f1 --- /dev/null +++ b/ImGuiColorTextEdit @@ -0,0 +1 @@ +Subproject commit ca2f9f1462e3b60e56351bc466acda448c5ea50d diff --git a/assimp b/assimp index 522c703..fcb1702 160000 --- a/assimp +++ b/assimp @@ -1 +1 @@ -Subproject commit 522c703bb913a73040590681c93d153cd2bbf354 +Subproject commit fcb1702162c044976d01e74162cb4fadb3f335de diff --git a/jolt b/jolt index e486f5b..f8a329a 160000 --- a/jolt +++ b/jolt @@ -1 +1 @@ -Subproject commit e486f5b5436c5c07f31b675e1102226b2b5745b8 +Subproject commit f8a329a6406d961349bc86dc477512e55358cebe diff --git a/ogre b/ogre index 2bdc6a2..f5dc58a 160000 --- a/ogre +++ b/ogre @@ -1 +1 @@ -Subproject commit 2bdc6a2fefa04de15e3623bcc30036ae4ae631a6 +Subproject commit f5dc58a742375296ba89a15fedbd48e9a238cfa7 diff --git a/ogre-projects/world2 b/ogre-projects/world2 index 884a310..0bd98ea 160000 --- a/ogre-projects/world2 +++ b/ogre-projects/world2 @@ -1 +1 @@ -Subproject commit 884a3100332fbf4ff696a8941d6e65a3022f1990 +Subproject commit 0bd98ea3e25d58c9672eb0a533fc46211768c3f5 diff --git a/recastnavigation b/recastnavigation index f9addb2..9f4ce64 160000 --- a/recastnavigation +++ b/recastnavigation @@ -1 +1 @@ -Subproject commit f9addb242713117cb95f49a26abe2aa128d0d5ef +Subproject commit 9f4ce64458dfae86e1239c525ddc219c4e9e06f1