livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Odd merge issue and ignore more crap.

master
Beq 2023-04-03 12:39:43 +01:00
parent 8ef61f6171
commit fc4181b478
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -19,11 +19,8 @@ debian/files
debian/secondlife-appearance-utility* debian/secondlife-appearance-utility*
debian/secondlife-viewer* debian/secondlife-viewer*
indra/.distcc indra/.distcc
build-vc80/ build-vc*-32*/
build-vc100/ build-vc*-64*/
build-vc120/
build-vc*-32/
build-vc*-64/
indra/CMakeFiles indra/CMakeFiles
indra/build-vc[0-9]* indra/build-vc[0-9]*
indra/lib/mono/1.0/*.dll indra/lib/mono/1.0/*.dll

5
indra/cmake/Tracy.cmake
View File

@ -7,7 +7,10 @@ add_library( ll::tracy INTERFACE IMPORTED )
set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.") set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
if (USE_TRACY) if (USE_TRACY)
use_system_binary(tracy) set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
# See: indra/llcommon/llprofiler.h
add_definitions(-DLL_PROFILER_CONFIGURATION=2)
use_prebuilt_binary(tracy) use_prebuilt_binary(tracy)
target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy) target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)