Split core server files from the UI.

profiler/CMakeLists.txt

@@ -48,59 +48,61 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
 
 set(SERVER_FILES
-    ../server/TracyBadVersion.cpp
+    TracyBadVersion.cpp
-    ../server/TracyColor.cpp
+    TracyColor.cpp
-    ../server/TracyEventDebug.cpp
+    TracyEventDebug.cpp
-    ../server/TracyFileselector.cpp
+    TracyFileselector.cpp
-    ../server/TracyFilesystem.cpp
+    TracyFilesystem.cpp
-    ../server/TracyImGui.cpp
+    TracyImGui.cpp
-    ../server/TracyMicroArchitecture.cpp
+    TracyMicroArchitecture.cpp
-    ../server/TracyMouse.cpp
+    TracyMouse.cpp
-    ../server/TracyProtoHistory.cpp
+    TracyProtoHistory.cpp
-    ../server/TracySourceContents.cpp
+    TracySourceContents.cpp
-    ../server/TracySourceTokenizer.cpp
+    TracySourceTokenizer.cpp
-    ../server/TracySourceView.cpp
+    TracySourceView.cpp
-    ../server/TracyStorage.cpp
+    TracyStorage.cpp
-    ../server/TracyTexture.cpp
+    TracyTexture.cpp
-    ../server/TracyTimelineController.cpp
+    TracyTimelineController.cpp
-    ../server/TracyTimelineItem.cpp
+    TracyTimelineItem.cpp
-    ../server/TracyTimelineItemCpuData.cpp
+    TracyTimelineItemCpuData.cpp
-    ../server/TracyTimelineItemGpu.cpp
+    TracyTimelineItemGpu.cpp
-    ../server/TracyTimelineItemPlot.cpp
+    TracyTimelineItemPlot.cpp
-    ../server/TracyTimelineItemThread.cpp
+    TracyTimelineItemThread.cpp
-    ../server/TracyUserData.cpp
+    TracyUserData.cpp
-    ../server/TracyUtility.cpp
+    TracyUtility.cpp
-    ../server/TracyView.cpp
+    TracyView.cpp
-    ../server/TracyView_Annotations.cpp
+    TracyView_Annotations.cpp
-    ../server/TracyView_Callstack.cpp
+    TracyView_Callstack.cpp
-    ../server/TracyView_Compare.cpp
+    TracyView_Compare.cpp
-    ../server/TracyView_ConnectionState.cpp
+    TracyView_ConnectionState.cpp
-    ../server/TracyView_ContextSwitch.cpp
+    TracyView_ContextSwitch.cpp
-    ../server/TracyView_CpuData.cpp
+    TracyView_CpuData.cpp
-    ../server/TracyView_FindZone.cpp
+    TracyView_FindZone.cpp
-    ../server/TracyView_FrameOverview.cpp
+    TracyView_FrameOverview.cpp
-    ../server/TracyView_FrameTimeline.cpp
+    TracyView_FrameTimeline.cpp
-    ../server/TracyView_FrameTree.cpp
+    TracyView_FrameTree.cpp
-    ../server/TracyView_GpuTimeline.cpp
+    TracyView_GpuTimeline.cpp
-    ../server/TracyView_Locks.cpp
+    TracyView_Locks.cpp
-    ../server/TracyView_Memory.cpp
+    TracyView_Memory.cpp
-    ../server/TracyView_Messages.cpp
+    TracyView_Messages.cpp
-    ../server/TracyView_Navigation.cpp
+    TracyView_Navigation.cpp
-    ../server/TracyView_NotificationArea.cpp
+    TracyView_NotificationArea.cpp
-    ../server/TracyView_Options.cpp
+    TracyView_Options.cpp
-    ../server/TracyView_Playback.cpp
+    TracyView_Playback.cpp
-    ../server/TracyView_Plots.cpp
+    TracyView_Plots.cpp
-    ../server/TracyView_Ranges.cpp
+    TracyView_Ranges.cpp
-    ../server/TracyView_Samples.cpp
+    TracyView_Samples.cpp
-    ../server/TracyView_Statistics.cpp
+    TracyView_Statistics.cpp
-    ../server/TracyView_Timeline.cpp
+    TracyView_Timeline.cpp
-    ../server/TracyView_TraceInfo.cpp
+    TracyView_TraceInfo.cpp
-    ../server/TracyView_Utility.cpp
+    TracyView_Utility.cpp
-    ../server/TracyView_ZoneInfo.cpp
+    TracyView_ZoneInfo.cpp
-    ../server/TracyView_ZoneTimeline.cpp
+    TracyView_ZoneTimeline.cpp
-    ../server/TracyWeb.cpp
+    TracyWeb.cpp
 )
 
+list(TRANSFORM SERVER_FILES PREPEND "src/profiler/")
+
 set(PROFILER_FILES
     src/imgui/imgui_impl_opengl3.cpp
     src/ConnectionHistory.cpp

profiler/src/BackendGlfw.cpp

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <thread>
 
-#include "../../server/TracyImGui.hpp"
+#include "profiler/TracyImGui.hpp"
 
 #include "Backend.hpp"
 #include "RunQueue.hpp"

profiler/src/BackendWayland.cpp

@@ -23,7 +23,7 @@
 #include "wayland/xdg-decoration.h"
 #include "wayland/xdg-shell.h"
 
-#include "../../server/TracyImGui.hpp"
+#include "profiler/TracyImGui.hpp"
 
 #include "Backend.hpp"
 #include "RunQueue.hpp"

profiler/src/ConnectionHistory.cpp

@@ -5,7 +5,7 @@
 #include "ConnectionHistory.hpp"
 
 #include "../../server/tracy_pdqsort.h"
-#include "../../server/TracyStorage.hpp"
+#include "profiler/TracyStorage.hpp"
 
 
 ConnectionHistory::ConnectionHistory()

profiler/src/Filters.cpp

@@ -4,7 +4,7 @@
 
 #include "Filters.hpp"
 
-#include "../../server/TracyStorage.hpp"
+#include "profiler/TracyStorage.hpp"
 
 
 Filters::Filters()

profiler/src/Fonts.cpp

@@ -4,7 +4,7 @@
 #include "Fonts.hpp"
 #include "misc/freetype/imgui_freetype.h"
 #include "imgui/imgui_impl_opengl3.h"
-#include "../../server/IconsFontAwesome6.h"
+#include "profiler/IconsFontAwesome6.h"
 
 #include "font/DroidSans.hpp"
 #include "font/FiraCodeRetina.hpp"

profiler/src/ImGuiContext.cpp

@@ -1,5 +1,5 @@
 #include <imgui.h>
-#include "../../server/TracyStorage.hpp"
+#include "profiler/TracyStorage.hpp"
 #include "ImGuiContext.hpp"
 
 ImGuiTracyContext::ImGuiTracyContext()

profiler/src/WindowPosition.cpp

@@ -3,7 +3,7 @@
 
 #include "WindowPosition.hpp"
 
-#include "../../server/TracyStorage.hpp"
+#include "profiler/TracyStorage.hpp"
 
 
 WindowPosition::WindowPosition()

profiler/src/main.cpp

@@ -30,23 +30,23 @@
 
 #include "../../public/common/TracyProtocol.hpp"
 #include "../../public/common/TracyVersion.hpp"
+#include "profiler/TracyBadVersion.hpp"
+#include "profiler/TracyConfig.hpp"
+#include "profiler/TracyFileselector.hpp"
+#include "profiler/TracyImGui.hpp"
+#include "profiler/TracyMouse.hpp"
+#include "profiler/TracyProtoHistory.hpp"
+#include "profiler/TracyStorage.hpp"
+#include "profiler/TracyTexture.hpp"
+#include "profiler/TracyView.hpp"
+#include "profiler/TracyWeb.hpp"
+#include "profiler/IconsFontAwesome6.h"
 #include "../../server/tracy_pdqsort.h"
 #include "../../server/tracy_robin_hood.h"
-#include "../../server/TracyBadVersion.hpp"
-#include "../../server/TracyConfig.hpp"
 #include "../../server/TracyFileHeader.hpp"
 #include "../../server/TracyFileRead.hpp"
-#include "../../server/TracyFileselector.hpp"
-#include "../../server/TracyImGui.hpp"
-#include "../../server/TracyMouse.hpp"
 #include "../../server/TracyPrint.hpp"
-#include "../../server/TracyProtoHistory.hpp"
-#include "../../server/TracyStorage.hpp"
-#include "../../server/TracyTexture.hpp"
-#include "../../server/TracyView.hpp"
-#include "../../server/TracyWeb.hpp"
 #include "../../server/TracyWorker.hpp"
-#include "../../server/IconsFontAwesome6.h"
 
 #include "icon.hpp"
 #include "zigzag01.hpp"

profiler/src/profiler/TracyTimelineController.hpp

@@ -6,9 +6,9 @@
 #include <vector>
 
 #include "TracyImGui.hpp"
-#include "TracyTaskDispatch.hpp"
+#include "../server/TracyTaskDispatch.hpp"
+#include "../server/tracy_robin_hood.h"
 #include "../public/common/TracyForceInline.hpp"
-#include "tracy_robin_hood.h"
 
 namespace tracy
 {

profiler/src/profiler/TracyUtility.hpp

@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 #include "imgui.h"
-#include "TracyEvent.hpp"
+#include "../server/TracyEvent.hpp"
 
 namespace tracy
 {

profiler/src/profiler/TracyView.hpp

@@ -15,16 +15,16 @@
 #include "TracyBuzzAnim.hpp"
 #include "TracyConfig.hpp"
 #include "TracyDecayValue.hpp"
-#include "TracyFileWrite.hpp"
-#include "TracyShortPtr.hpp"
 #include "TracySourceContents.hpp"
 #include "TracyTimelineController.hpp"
 #include "TracyUserData.hpp"
 #include "TracyUtility.hpp"
-#include "TracyVector.hpp"
 #include "TracyViewData.hpp"
-#include "TracyWorker.hpp"
+#include "../server/TracyFileWrite.hpp"
-#include "tracy_robin_hood.h"
+#include "../server/TracyShortPtr.hpp"
+#include "../server/TracyWorker.hpp"
+#include "../server/tracy_robin_hood.h"
+#include "../server/TracyVector.hpp"
 
 namespace tracy
 {