From 63e2c16e745664e225998fe5970c96a4d801aba2 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Mon, 17 May 2021 12:05:14 +0200 Subject: [PATCH 1/5] 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. --- server/TracyMouse.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/TracyMouse.hpp b/server/TracyMouse.hpp index 0b143747..e52efe2b 100644 --- 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 { From bcb250aaabee890ca954473581c895cf45e52fa4 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Mon, 17 May 2021 12:06:37 +0200 Subject: [PATCH 2/5] Update TracySourceView.cpp --- server/TracySourceView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp index 0313f8bf..6080c759 100644 --- a/server/TracySourceView.cpp +++ b/server/TracySourceView.cpp @@ -4,7 +4,7 @@ #include -#include "../imgui/imgui.h" +#include "imgui.h" #include "TracyCharUtil.hpp" #include "TracyColor.hpp" #include "TracyFilesystem.hpp" From 4ab706d53816bcd903bea1c4554927fcd87425e1 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Mon, 17 May 2021 12:07:06 +0200 Subject: [PATCH 3/5] Update TracyMouse.cpp --- server/TracyMouse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/TracyMouse.cpp b/server/TracyMouse.cpp index 0f36a85c..3053c2dd 100644 --- 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 { From 2cdc3abba2c3a8869d22ec1cb73e5694aa71a011 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Mon, 17 May 2021 12:07:35 +0200 Subject: [PATCH 4/5] Update TracyImGui.hpp --- server/TracyImGui.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/TracyImGui.hpp b/server/TracyImGui.hpp index a3b99b49..e9379c15 100644 --- a/server/TracyImGui.hpp +++ b/server/TracyImGui.hpp @@ -9,8 +9,8 @@ #include #include -#include "../imgui/imgui.h" -#include "../imgui/imgui_internal.h" +#include "imgui.h" +#include "imgui_internal.h" #include "../common/TracyForceInline.hpp" #include "IconsFontAwesome5.h" From aace8ac3170ac9f4ef2a039c702e589a57fefaef Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Mon, 17 May 2021 12:09:14 +0200 Subject: [PATCH 5/5] Update TracyView.cpp --- server/TracyView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 9c332c5a..fc10ddea 100644 --- 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"