Compare commits

...

4 Commits

Author SHA1 Message Date
502209675d aarch64 updates 2026-02-14 00:29:14 +03:00
ce2b462a2e Fixes for addons on aarch64 2026-02-12 14:23:06 +03:00
8685e42527 Integrated Tracy, NPC animation fixes 2026-02-12 14:03:52 +03:00
d4b621ba5e Using tracy-0.12.2 2026-02-10 14:38:56 +03:00
4 changed files with 24 additions and 3 deletions

4
.gitmodules vendored
View File

@@ -170,3 +170,7 @@
path = recastnavigation
url = https://github.com/recastnavigation/recastnavigation
branch = main
[submodule "tracy"]
path = tracy
url = https://github.com/wolfpld/tracy
branch = master

View File

@@ -408,16 +408,32 @@ ExternalProject_Add(recastnavigation-static
${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DRECASTNAVIGATION_DEMO=OFF -DRECASTNAVIGATION_TESTS=OFF -DRECASTNAVIGATION_EXAMPLES=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
)
ExternalProject_Add(tracy
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tracy
CMAKE_ARGS ${CUSTOM_OPTS} -DTRACY_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
)
ExternalProject_Add(tracy-static
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tracy
CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DTRACY_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DDOWNLOAD_FREETYPE=ON
)
ExternalProject_Add(tracy-capture-static
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tracy/capture
CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DTRACY_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DDOWNLOAD_FREETYPE=ON
)
ExternalProject_Add(tracy-profiler-static
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tracy/profiler
CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DTRACY_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DDOWNLOAD_FREETYPE=ON -DLEGACY=ON
)
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 nanoflann recastnavigation
DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs blender json nanoflann recastnavigation tracy
)
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 nanoflann-static blender recastnavigation-static
DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static json-static nanoflann-static blender recastnavigation-static tracy-static
)
ExternalProject_Add(jolt-demo

1
tracy Submodule

Submodule tracy added at c556831ddc