diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-09-04 00:57:46 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-09-04 00:57:46 +0000 |
| commit | 0f60db6220f544e43a686312cc5e91998309c996 (patch) | |
| tree | fba3680c5a6b8df78da930778031f48f98a94e61 /indra/llcommon/llframetimer.cpp | |
| parent | 0528890ab1fec27014992b6388498a6e881d9f24 (diff) | |
| parent | c37cc7c3a4888fdca132613d627d7ad90517332a (diff) | |
Merged in SL-15709-Tracy (pull request #677)
SL-15709: Windows: Include Tracy source directly; don't use a library
Diffstat (limited to 'indra/llcommon/llframetimer.cpp')
| -rw-r--r-- | indra/llcommon/llframetimer.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp index e293a557c0..c54029e8b4 100644 --- a/indra/llcommon/llframetimer.cpp +++ b/indra/llcommon/llframetimer.cpp @@ -29,13 +29,10 @@ #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 +// We don't bother building a stand alone lib; we just need to include the one source file for Tracy support +#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER + #include "TracyClient.cpp" +#endif // LL_PROFILER_CONFIGURATION // Static members //LLTimer LLFrameTimer::sInternalTimer; |