From 785d9c03e6ba3a89e17581630fd0c9eec4e6e216 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Thu, 1 Apr 2021 00:02:23 +0200
Subject: [PATCH] Need to compile against Win7 to use tracy.

---
 indra/cmake/Tracy.cmake          | 2 +-
 indra/llcommon/fstracyclient.cpp | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index db1e609fb8..e471f0109e 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -5,7 +5,7 @@ if (USE_TRACY_PROFILER)
     if (WINDOWS)
         # set(TRACY_LIBRARIES 
         #     ${ARCH_PREBUILT_DIRS_RELEASE}/Tracy.lib
-        add_definitions(-DTRACY_ENABLE=1 -DTRACY_NO_FASTTIMERS)
+        add_definitions(-DTRACY_ENABLE=1 -DTRACY_NO_FASTTIMERS -DWINVER=0x0601 )
         set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
     elseif (DARWIN)
         message(FATAL_ERROR "Tracy is not yet implemented in FS for OSX.")
diff --git a/indra/llcommon/fstracyclient.cpp b/indra/llcommon/fstracyclient.cpp
index 55c05f0cc8..f21c8fd197 100644
--- a/indra/llcommon/fstracyclient.cpp
+++ b/indra/llcommon/fstracyclient.cpp
@@ -23,16 +23,7 @@
 #include "client/TracyCallstack.cpp"
 #include "client/TracySysTime.cpp"
 
-// Black magic on Windows to deal with windows entry points that are not found in a standard LL windows build
-// This is less invasive than changing the 3p library itself.
-// TODO: work out why the windows trace subsystem stuff is not defined in our builds, this then goes away (hopefully)
-#if defined(LL_WINDOWS) && !defined(__CYGWIN__)
-#define __CYGWIN__
 #include "client/TracySysTrace.cpp"
-#undef __CYGWIN__
-#else
-#include "client/TracySysTrace.cpp"
-#endif
 
 #include "common/TracySocket.cpp"
 #include "client/tracy_rpmalloc.cpp"