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

Compare commits

base: slapin:60f74c76bdab8557c870c4f410fb9a8fdb42140a
Branches Tags
slapin:master
...
compare: slapin:8685e4252793d2e3139e4c82038724703cfddff8
Branches Tags
slapin:master

2 Commits
60f74c76bd ... 8685e42527

Author SHA1 Message Date
Sergey Lapin
8685e42527 Integrated Tracy, NPC animation fixes 2026-02-12 14:03:52 +03:00
Sergey Lapin
d4b621ba5e Using tracy-0.12.2 2026-02-10 14:38:56 +03:00
4 changed files with 24 additions and 3 deletions
Expand all files Collapse all files

4
.gitmodules vendored
View File

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

20
CMakeLists.txt
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 ${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 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 nanoflann recastnavigation DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs blender json nanoflann recastnavigation tracy
) )
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 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 ExternalProject_Add(jolt-demo

2
ogre-projects/world2

Submodule ogre-projects/world2 updated: bf25ef1a80...74a1adfb27

1
tracy Submodule

Submodule tracy added at c556831ddc