Updated dependencies and versions
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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 "<BINARY_DIR>/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 "<BINARY_DIR>/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
|
||||
|
||||
1
ImGuiColorTextEdit
Submodule
1
ImGuiColorTextEdit
Submodule
Submodule ImGuiColorTextEdit added at ca2f9f1462
2
assimp
2
assimp
Submodule assimp updated: 522c703bb9...fcb1702162
2
jolt
2
jolt
Submodule jolt updated: e486f5b543...f8a329a640
2
ogre
2
ogre
Submodule ogre updated: 2bdc6a2fef...f5dc58a742
Submodule ogre-projects/world2 updated: 884a310033...0bd98ea3e2
Submodule recastnavigation updated: f9addb2427...9f4ce64458
Reference in New Issue
Block a user