diff options
author | Bartosz Taudul <wolf@nereid.pl> | 2022-08-27 17:05:36 +0300 |
---|---|---|
committer | Bartosz Taudul <wolf@nereid.pl> | 2022-08-27 17:05:36 +0300 |
commit | be392a76fb7eb684fab259485d27a6adbceeef32 (patch) | |
tree | fcc7de1a6e6583a7bc2a1e26e9b50f1752c3291a | |
parent | 165099ca877154289ad1e4f23ed26b9f1de5707b (diff) |
Move TracyVersion.hpp to common.
-rw-r--r-- | extra/identify.cpp | 2 | ||||
-rw-r--r-- | extra/version.cpp | 2 | ||||
-rw-r--r-- | profiler/build/win32/Tracy.vcxproj | 2 | ||||
-rw-r--r-- | profiler/build/win32/Tracy.vcxproj.filters | 6 | ||||
-rw-r--r-- | profiler/src/HttpRequest.cpp | 2 | ||||
-rw-r--r-- | profiler/src/main.cpp | 3 | ||||
-rw-r--r-- | public/common/TracyVersion.hpp (renamed from server/TracyVersion.hpp) | 0 | ||||
-rw-r--r-- | server/TracyWorker.cpp | 2 | ||||
-rw-r--r-- | update/src/update.cpp | 2 |
9 files changed, 10 insertions, 11 deletions
diff --git a/extra/identify.cpp b/extra/identify.cpp index 6d29f348..d767b224 100644 --- a/extra/identify.cpp +++ b/extra/identify.cpp @@ -5,7 +5,7 @@ #include <stdio.h> #include "../server/TracyFileRead.hpp" -#include "../server/TracyVersion.hpp" +#include "../public/common/TracyVersion.hpp" static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch }; enum { FileHeaderMagic = 5 }; diff --git a/extra/version.cpp b/extra/version.cpp index 3399fa2e..4ada71da 100644 --- a/extra/version.cpp +++ b/extra/version.cpp @@ -2,7 +2,7 @@ #include <stdio.h> #include "../server/TracyFileHeader.hpp" -#include "../server/TracyVersion.hpp" +#include "../public/common/TracyVersion.hpp" int main() { diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index a508182f..ec13eba9 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -236,6 +236,7 @@ <ClInclude Include="..\..\..\public\common\TracyStackFrames.hpp" /> <ClInclude Include="..\..\..\public\common\TracySystem.hpp" /> <ClInclude Include="..\..\..\public\common\TracyUwp.hpp" /> + <ClInclude Include="..\..\..\public\common\TracyVersion.hpp" /> <ClInclude Include="..\..\..\public\common\TracyYield.hpp" /> <ClInclude Include="..\..\..\public\common\tracy_lz4.hpp" /> <ClInclude Include="..\..\..\public\common\tracy_lz4hc.hpp" /> @@ -276,7 +277,6 @@ <ClInclude Include="..\..\..\server\TracyUtility.hpp" /> <ClInclude Include="..\..\..\server\TracyVarArray.hpp" /> <ClInclude Include="..\..\..\server\TracyVector.hpp" /> - <ClInclude Include="..\..\..\server\TracyVersion.hpp" /> <ClInclude Include="..\..\..\server\TracyView.hpp" /> <ClInclude Include="..\..\..\server\TracyViewData.hpp" /> <ClInclude Include="..\..\..\server\TracyWeb.hpp" /> diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters index 515c238c..c233fda0 100644 --- a/profiler/build/win32/Tracy.vcxproj.filters +++ b/profiler/build/win32/Tracy.vcxproj.filters @@ -404,9 +404,6 @@ <ClInclude Include="..\..\..\server\TracyVarArray.hpp"> <Filter>server</Filter> </ClInclude> - <ClInclude Include="..\..\..\server\TracyVersion.hpp"> - <Filter>server</Filter> - </ClInclude> <ClInclude Include="..\..\..\server\TracyStringDiscovery.hpp"> <Filter>server</Filter> </ClInclude> @@ -725,6 +722,9 @@ <ClInclude Include="..\..\..\server\IconsFontAwesome6.h"> <Filter>server</Filter> </ClInclude> + <ClInclude Include="..\..\..\public\common\TracyVersion.hpp"> + <Filter>common</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Natvis Include="DebugVis.natvis" /> diff --git a/profiler/src/HttpRequest.cpp b/profiler/src/HttpRequest.cpp index 245bb586..37a952a9 100644 --- a/profiler/src/HttpRequest.cpp +++ b/profiler/src/HttpRequest.cpp @@ -4,7 +4,7 @@ #include <string.h> #include "../public/common/TracySocket.hpp" -#include "../server/TracyVersion.hpp" +#include "../public/common/TracyVersion.hpp" #include "HttpRequest.hpp" #if defined _WIN32 diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp index 8f91afb0..9762bca0 100644 --- a/profiler/src/main.cpp +++ b/profiler/src/main.cpp @@ -30,6 +30,7 @@ #include "stb_image_resize.h" #include "../../public/common/TracyProtocol.hpp" +#include "../../public/common/TracyVersion.hpp" #include "../../server/tracy_pdqsort.h" #include "../../server/tracy_robin_hood.h" #include "../../server/TracyBadVersion.hpp" @@ -41,11 +42,9 @@ #include "../../server/TracyProtoHistory.hpp" #include "../../server/TracyStorage.hpp" #include "../../server/TracyTexture.hpp" -#include "../../server/TracyVersion.hpp" #include "../../server/TracyView.hpp" #include "../../server/TracyWeb.hpp" #include "../../server/TracyWorker.hpp" -#include "../../server/TracyVersion.hpp" #include "../../server/IconsFontAwesome6.h" #include "icon.hpp" diff --git a/server/TracyVersion.hpp b/public/common/TracyVersion.hpp index d7d900db..d7d900db 100644 --- a/server/TracyVersion.hpp +++ b/public/common/TracyVersion.hpp diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index da477e84..b86d1739 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -28,11 +28,11 @@ #include "../public/common/TracySystem.hpp" #include "../public/common/TracyYield.hpp" #include "../public/common/TracyStackFrames.hpp" +#include "../public/common/TracyVersion.hpp" #include "TracyFileRead.hpp" #include "TracyFileWrite.hpp" #include "TracySort.hpp" #include "TracyTaskDispatch.hpp" -#include "TracyVersion.hpp" #include "TracyWorker.hpp" namespace tracy diff --git a/update/src/update.cpp b/update/src/update.cpp index 62a30ebd..f3cba1b7 100644 --- a/update/src/update.cpp +++ b/update/src/update.cpp @@ -7,10 +7,10 @@ #include <stdio.h> #include <stdlib.h> +#include "../../public/common/TracyVersion.hpp" #include "../../server/TracyFileRead.hpp" #include "../../server/TracyFileWrite.hpp" #include "../../server/TracyPrint.hpp" -#include "../../server/TracyVersion.hpp" #include "../../server/TracyWorker.hpp" #include "../../zstd/zstd.h" #include "../../getopt/getopt.h" |