Update (action nodes, jolt, lots of other updates)
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -1,2 +1,7 @@
|
|||||||
build_linux_*/**
|
build_linux_*/**
|
||||||
lib/**
|
lib/**
|
||||||
|
ogre-sdk-static/**
|
||||||
|
ogre-sdk/**
|
||||||
|
tmp/
|
||||||
|
tmp2/
|
||||||
|
blender-bin/
|
||||||
|
|||||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -158,3 +158,7 @@
|
|||||||
path = freetype
|
path = freetype
|
||||||
url = https://github.com/freetype/freetype
|
url = https://github.com/freetype/freetype
|
||||||
branch = master
|
branch = master
|
||||||
|
[submodule "nanoflann"]
|
||||||
|
path = nanoflann
|
||||||
|
url = https://github.com/jlblancoc/nanoflann
|
||||||
|
branch = master
|
||||||
|
|||||||
@@ -296,6 +296,7 @@ ExternalProject_Add(ogre-static
|
|||||||
-DASSIMP_BUILD_ASSIMP_TOOLS=ON
|
-DASSIMP_BUILD_ASSIMP_TOOLS=ON
|
||||||
-DOGRE_STATIC=TRUE
|
-DOGRE_STATIC=TRUE
|
||||||
${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug
|
${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
|
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
|
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
${CUSTOM_OPTS} -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DCPP_RTTI_ENABLED=ON -DDEBUG_RENDERER_IN_DISTRIBUTION=ON
|
${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
|
ExternalProject_Add(jolt-static
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build
|
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug -DCPP_RTTI_ENABLED=ON -DDEBUG_RENDERER_IN_DISTRIBUTION=ON
|
${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
|
ExternalProject_Add(json
|
||||||
@@ -381,16 +384,28 @@ ExternalProject_Add(json-static
|
|||||||
${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug
|
${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
|
ExternalProject_Add(world2
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2
|
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2
|
||||||
CMAKE_ARGS ${CUSTOM_OPTS} -DBLENDER=${CMAKE_CURRENT_BINARY_DIR}/blender-bin/bin/blender
|
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
|
ExternalProject_Add(world2-static
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2
|
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2
|
||||||
CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DBLENDER=${CMAKE_CURRENT_BINARY_DIR}/blender-bin/bin/blender
|
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
|
ExternalProject_Add(jolt-demo
|
||||||
|
|||||||
2
assimp
2
assimp
Submodule assimp updated: db0bde758e...522c703bb9
2
bullet3
2
bullet3
Submodule bullet3 updated: 2c204c49e5...63c4d67e33
2
flecs
2
flecs
Submodule flecs updated: 60c5290d50...a7293a9455
2
freetype
2
freetype
Submodule freetype updated: 23b6cd27ff...341049a95b
2
jolt
2
jolt
Submodule jolt updated: 1262f85596...7fd7a7159c
1
nanoflann
Submodule
1
nanoflann
Submodule
Submodule nanoflann added at ba47cfcb12
2
ogre
2
ogre
Submodule ogre updated: 2579adf8f9...79bfa33370
Submodule ogre-pagedgeometry updated: a324fc9827...5297d3d3f7
Submodule ogre-procedural updated: 912e0ce892...338a56566d
Submodule ogre-projects/world2 updated: 81a78990ce...4cf0ea5321
Reference in New Issue
Block a user