slapin/ogre-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update (action nodes, jolt, lots of other updates)

Browse Source
This commit is contained in:
Sergey Lapin
2026-01-23 21:34:42 +03:00
parent b3ceed8e65
commit b31899b38a
13 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@@ -296,6 +296,7 @@ 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
)
@@ -361,12 +362,14 @@ ExternalProject_Add(jolt
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build
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
)
ExternalProject_Add(jolt-static
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build
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
)
ExternalProject_Add(json
@@ -381,16 +384,28 @@ ExternalProject_Add(json-static
${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug
)
ExternalProject_Add(nanoflann
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nanoflann
CMAKE_ARGS
${CUSTOM_OPTS} -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF
)
ExternalProject_Add(nanoflann-static
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nanoflann
CMAKE_ARGS
${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug
)
ExternalProject_Add(world2
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2
CMAKE_ARGS ${CUSTOM_OPTS} -DBLENDER=${CMAKE_CURRENT_BINARY_DIR}/blender-bin/bin/blender
DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs blender json
DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs blender json nanoflann
)
ExternalProject_Add(world2-static
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2
CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DBLENDER=${CMAKE_CURRENT_BINARY_DIR}/blender-bin/bin/blender
DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static json-static blender
DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static json-static nanoflann-static blender
)
ExternalProject_Add(jolt-demo