diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ab2b2a..7572b17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/ogre-projects/world2 b/ogre-projects/world2 index bf25ef1..74a1adf 160000 --- a/ogre-projects/world2 +++ b/ogre-projects/world2 @@ -1 +1 @@ -Subproject commit bf25ef1a800501e6f4890e355d15f230444c89e9 +Subproject commit 74a1adfb27e8799e4987b28f2a2fc8d59c3de5ce