diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-08-27 07:00:13 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-08-27 07:00:13 +0000 |
| commit | 134dc986361256d71884257cb870a1f1ac6a848c (patch) | |
| tree | 5dc0b5719916977b4a35005aed24bd4aedd19d93 /indra/llcommon/llframetimer.cpp | |
| parent | 7637f9845b351a7cb3e41d97db7d3715e119e2df (diff) | |
| parent | cdf2bdafd394a97b917cc0a71b2bc8531cce40c7 (diff) | |
Merged in SL-15709-Tracy (pull request #634)
SL-15709: Add Tracy support to viewer
Diffstat (limited to 'indra/llcommon/llframetimer.cpp')
| -rw-r--r-- | indra/llcommon/llframetimer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp index 1e9920746b..e293a557c0 100644 --- a/indra/llcommon/llframetimer.cpp +++ b/indra/llcommon/llframetimer.cpp @@ -29,6 +29,14 @@ #include "llframetimer.h" +// On Windows we build a static lib and link with that +// On macOS we don't bother building a stand alone lib, just include the one source file we need for Tracy support +#if LL_DARWIN + #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER + #include "TracyClient.cpp" + #endif // LL_PROFILER_CONFIGURATION +#endif // LL_DARWIN + // Static members //LLTimer LLFrameTimer::sInternalTimer; U64 LLFrameTimer::sStartTotalTime = totalTime(); |