From fc4181b478b37ffa88382c4e22ae3bd8b85bc14b Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 3 Apr 2023 12:39:43 +0100
Subject: [PATCH] Odd merge issue and ignore more crap.

---
 .gitignore              | 7 ++-----
 indra/cmake/Tracy.cmake | 5 ++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 099da4e039..44990e3373 100755
--- a/.gitignore
+++ b/.gitignore
@@ -19,11 +19,8 @@ debian/files
 debian/secondlife-appearance-utility*
 debian/secondlife-viewer*
 indra/.distcc
-build-vc80/
-build-vc100/
-build-vc120/
-build-vc*-32/
-build-vc*-64/
+build-vc*-32*/
+build-vc*-64*/
 indra/CMakeFiles
 indra/build-vc[0-9]*
 indra/lib/mono/1.0/*.dll
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index b3de06a876..ebadb4dd13 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -7,7 +7,10 @@ add_library( ll::tracy INTERFACE IMPORTED )
 set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
 
 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)
 
   target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)