diff options
| author | AiraYumi <aira.youme@airanyumi.net> | 2024-04-09 05:38:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 23:38:01 +0300 |
| commit | bbd6dfc21a1a6c07824fc81e0659a2c200581d3b (patch) | |
| tree | bd27436d4b246116d53e7b3e2e5e007f15d6ad66 /indra/llcommon | |
| parent | e79c32eee89c31e730ac0562d680e6e0ebfd4a68 (diff) | |
Some fixes to linux builds (#1144)
* compile flag cleanup for linux
* rollback indra/llcommon/llprofiler.h
* use 3p fltk package
* fix build gcc 13 (dangling-pointer)
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llprofiler.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index 0297bbe592..af5e5777bf 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -74,10 +74,6 @@ #define LL_PROFILER_CONFIGURATION LL_PROFILER_CONFIG_FAST_TIMER #endif -#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER - #include "Tracy.hpp" -#endif - extern thread_local bool gProfilerEnabled; #if defined(LL_PROFILER_CONFIGURATION) && (LL_PROFILER_CONFIGURATION > LL_PROFILER_CONFIG_NONE) @@ -88,6 +84,7 @@ extern thread_local bool gProfilerEnabled; // #define TRACY_NO_BROADCAST 1 // #define TRACY_ONLY_LOCALHOST 1 #define TRACY_ONLY_IPV4 1 + #include "Tracy.hpp" // Enable OpenGL profiling #define LL_PROFILER_ENABLE_TRACY_OPENGL 0 |