Merge pull request #220 from ktf/patch-1

Fix compilation on macOS 11.0.0 with XCode 12.5
Update TracyView.cpp
2025-01-15 11:57:59 +00:00 · 2021-05-17 13:37:26 +02:00 · 2021-05-17 12:09:14 +02:00 · 2021-05-17 12:07:35 +02:00 · 2021-05-17 12:07:06 +02:00 · 2021-05-17 12:06:37 +02:00
5 changed files with 6 additions and 6 deletions
--- a/server/TracyImGui.hpp
+++ b/server/TracyImGui.hpp
@ -9,8 +9,8 @@
 #include <assert.h>
 #include <stdint.h>

-#include "../imgui/imgui.h"
-#include "../imgui/imgui_internal.h"
+#include "imgui.h"
+#include "imgui_internal.h"

 #include "../common/TracyForceInline.hpp"
 #include "IconsFontAwesome5.h"
--- a/server/TracyMouse.cpp
+++ b/server/TracyMouse.cpp
@ -2,7 +2,7 @@

 #include "TracyMouse.hpp"

-#include "../imgui/imgui_internal.h"
+#include "imgui_internal.h"

 namespace tracy
 {
--- a/server/TracyMouse.hpp
+++ b/server/TracyMouse.hpp
@ -1,7 +1,7 @@
 #ifndef __TRACYMOUSE_HPP__
 #define __TRACYMOUSE_HPP__

-#include "../imgui/imgui.h"
+#include "imgui.h"

 namespace tracy
 {
--- a/server/TracySourceView.cpp
+++ b/server/TracySourceView.cpp
@ -4,7 +4,7 @@

 #include <capstone.h>

-#include "../imgui/imgui.h"
+#include "imgui.h"
 #include "TracyCharUtil.hpp"
 #include "TracyColor.hpp"
 #include "TracyFilesystem.hpp"
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@ -45,7 +45,7 @@
 #include "TracyStackFrames.hpp"
 #include "TracyView.hpp"

-#include "../imgui/imgui_internal.h"
+#include "imgui_internal.h"

 #ifndef TRACY_NO_FILESELECTOR
 #  include "../nfd/nfd.h"
Author	SHA1	Message	Date
Bartosz Taudul	2544a91c6b	Merge pull request #220 from ktf/patch-1 Fix compilation on macOS 11.0.0 with XCode 12.5	2021-05-17 13:37:26 +02:00
Giulio Eulisse	aace8ac317	Update TracyView.cpp	2021-05-17 12:09:14 +02:00
Giulio Eulisse	2cdc3abba2	Update TracyImGui.hpp	2021-05-17 12:07:35 +02:00
Giulio Eulisse	4ab706d538	Update TracyMouse.cpp	2021-05-17 12:07:06 +02:00
Giulio Eulisse	bcb250aaab	Update TracySourceView.cpp	2021-05-17 12:06:37 +02:00
Giulio Eulisse	63e2c16e74	Do not use relative include path for ImGUI.h #pragma once gets confused by `../../imgui/imgui.h` and `imgui.h` on macOS with XCode 12.5.	2021-05-17 12:05:14 +02:00