diff --git a/TracyClient.cpp b/TracyClient.cpp index 838c3bd8..bd6026da 100644 --- a/TracyClient.cpp +++ b/TracyClient.cpp @@ -41,6 +41,7 @@ # else # include "libbacktrace/elf.cpp" # endif +# include "common/TracyStackFrames.cpp" #endif #ifdef _MSC_VER diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index ace19c62..4b172cb4 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -86,6 +86,7 @@ + @@ -93,7 +94,6 @@ - @@ -137,6 +137,7 @@ + @@ -150,7 +151,6 @@ - diff --git a/capture/build/win32/capture.vcxproj.filters b/capture/build/win32/capture.vcxproj.filters index c3d3ce2b..c81c2920 100644 --- a/capture/build/win32/capture.vcxproj.filters +++ b/capture/build/win32/capture.vcxproj.filters @@ -69,9 +69,6 @@ getopt - - server - zstd\common @@ -159,6 +156,9 @@ zstd\dictBuilder + + common + @@ -236,9 +236,6 @@ getopt - - server - zstd @@ -344,5 +341,8 @@ zstd + + common + \ No newline at end of file diff --git a/capture/src/capture.cpp b/capture/src/capture.cpp index 4736550e..749c3579 100644 --- a/capture/src/capture.cpp +++ b/capture/src/capture.cpp @@ -14,10 +14,10 @@ #include #include "../../common/TracyProtocol.hpp" +#include "../../common/TracyStackFrames.hpp" #include "../../server/TracyFileWrite.hpp" #include "../../server/TracyMemory.hpp" #include "../../server/TracyPrint.hpp" -#include "../../server/TracyStackFrames.hpp" #include "../../server/TracyWorker.hpp" #ifdef _WIN32 diff --git a/server/TracyStackFrames.cpp b/common/TracyStackFrames.cpp similarity index 100% rename from server/TracyStackFrames.cpp rename to common/TracyStackFrames.cpp diff --git a/server/TracyStackFrames.hpp b/common/TracyStackFrames.hpp similarity index 100% rename from server/TracyStackFrames.hpp rename to common/TracyStackFrames.hpp diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 290980c1..b1ffea87 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -86,6 +86,7 @@ + @@ -136,6 +137,7 @@ + diff --git a/csvexport/build/win32/csvexport.vcxproj.filters b/csvexport/build/win32/csvexport.vcxproj.filters index 4b41bb3e..837d7985 100644 --- a/csvexport/build/win32/csvexport.vcxproj.filters +++ b/csvexport/build/win32/csvexport.vcxproj.filters @@ -156,6 +156,9 @@ zstd\dictBuilder + + common + @@ -338,5 +341,8 @@ zstd\dictBuilder + + common + \ No newline at end of file diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 36e1b37e..6cd81897 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -86,6 +86,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/import-chrome/build/win32/import-chrome.vcxproj.filters b/import-chrome/build/win32/import-chrome.vcxproj.filters index 7c26e2f2..4abea113 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj.filters +++ b/import-chrome/build/win32/import-chrome.vcxproj.filters @@ -147,6 +147,9 @@ zstd\dictBuilder + + common + @@ -323,5 +326,8 @@ zstd\dictBuilder + + common + \ No newline at end of file diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index b6dac3d5..f3f418b3 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -104,6 +104,7 @@ + @@ -126,7 +127,6 @@ - @@ -184,6 +184,7 @@ + @@ -222,7 +223,6 @@ - diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters index 2f97b54e..6e0b3322 100644 --- a/profiler/build/win32/Tracy.vcxproj.filters +++ b/profiler/build/win32/Tracy.vcxproj.filters @@ -147,9 +147,6 @@ src - - server - imgui @@ -249,6 +246,9 @@ zstd\dictBuilder + + common + @@ -458,9 +458,6 @@ src - - server - server @@ -578,6 +575,9 @@ zstd\dictBuilder + + common + diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 3388963d..87cb2c6f 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -42,8 +42,8 @@ #include "TracyPrint.hpp" #include "TracySort.hpp" #include "TracySourceView.hpp" -#include "TracyStackFrames.hpp" #include "TracyView.hpp" +#include "../common/TracyStackFrames.hpp" #include "imgui_internal.h" diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index f50ccb09..039405ca 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -29,11 +29,11 @@ #include "TracyFileRead.hpp" #include "TracyFileWrite.hpp" #include "TracySort.hpp" -#include "TracyStackFrames.hpp" #include "TracyTaskDispatch.hpp" #include "TracyVersion.hpp" #include "TracyWorker.hpp" #include "TracyYield.hpp" +#include "../common/TracyStackFrames.hpp" namespace tracy { diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 766c920e..f7d5fa7d 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -86,6 +86,7 @@ + @@ -136,6 +137,7 @@ + diff --git a/update/build/win32/update.vcxproj.filters b/update/build/win32/update.vcxproj.filters index 6e9ebba3..cb586be7 100644 --- a/update/build/win32/update.vcxproj.filters +++ b/update/build/win32/update.vcxproj.filters @@ -156,6 +156,9 @@ zstd\dictBuilder + + common + @@ -338,5 +341,8 @@ zstd\dictBuilder + + common + \ No newline at end of file