From 94ec6a0d9d0880824fd54a7aeef8924e65abaee7 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Mon, 31 May 2021 02:19:35 +0200 Subject: [PATCH] Move TracyYield.hpp to common. --- {server => common}/TracyYield.hpp | 2 +- profiler/build/win32/Tracy.vcxproj | 2 +- profiler/build/win32/Tracy.vcxproj.filters | 6 +++--- server/TracyFileRead.hpp | 2 +- server/TracyWorker.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename {server => common}/TracyYield.hpp (89%) diff --git a/server/TracyYield.hpp b/common/TracyYield.hpp similarity index 89% rename from server/TracyYield.hpp rename to common/TracyYield.hpp index 4eb3851a..403ca29c 100644 --- a/server/TracyYield.hpp +++ b/common/TracyYield.hpp @@ -7,7 +7,7 @@ # include #endif -#include "../common/TracyForceInline.hpp" +#include "TracyForceInline.hpp" namespace tracy { diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index b6dac3d5..e059b5d0 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -185,6 +185,7 @@ + @@ -236,7 +237,6 @@ - diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters index 2f97b54e..62d599e4 100644 --- a/profiler/build/win32/Tracy.vcxproj.filters +++ b/profiler/build/win32/Tracy.vcxproj.filters @@ -425,9 +425,6 @@ server - - server - server @@ -578,6 +575,9 @@ zstd\dictBuilder + + common + diff --git a/server/TracyFileRead.hpp b/server/TracyFileRead.hpp index 1579e205..609731b7 100644 --- a/server/TracyFileRead.hpp +++ b/server/TracyFileRead.hpp @@ -22,7 +22,7 @@ #include "TracyFileHeader.hpp" #include "TracyMmap.hpp" -#include "TracyYield.hpp" +#include "../common/TracyYield.hpp" #include "../common/tracy_lz4.hpp" #include "../common/TracyForceInline.hpp" #include "../zstd/zstd.h" diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index d4ce97cb..02161adb 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -26,13 +26,13 @@ #include "../common/TracyProtocol.hpp" #include "../common/TracySystem.hpp" +#include "../common/TracyYield.hpp" #include "TracyFileRead.hpp" #include "TracyFileWrite.hpp" #include "TracySort.hpp" #include "TracyTaskDispatch.hpp" #include "TracyVersion.hpp" #include "TracyWorker.hpp" -#include "TracyYield.hpp" namespace tracy {