Merge pull request #2 from NotExactlySiev/nix

Fix non-standard includes

Author: NotExactlySiev

Makefile

@@ -39,6 +39,7 @@ CPPFLAGS += -Ithird_party/luv/deps/lua-compat-5.3/c-api
 CPPFLAGS += -Ithird_party/magic_enum/include/magic_enum
 CPPFLAGS += -Ithird_party/md4c/src
 CPPFLAGS += -Ithird_party/multipart-parser-c
+CPPFLAGS += -Ithird_party/tracy/public
 CPPFLAGS += -Ithird_party/ucl -Ithird_party/ucl/include
 CPPFLAGS += -Ithird_party/uriparser/include
 CPPFLAGS += -Ithird_party/zep/extensions

src/core/DynaRec_aa64/recompiler.h

@@ -31,7 +31,7 @@
 #include "fmt/format.h"
 #include "regAllocation.h"
 #include "spu/interface.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #define HOST_REG_CACHE_OFFSET(x) ((uintptr_t) & m_hostRegisterCache[(x)] - (uintptr_t)this)
 #define GPR_OFFSET(x) ((uintptr_t) & m_regs.GPR.r[(x)] - (uintptr_t)this)

src/core/DynaRec_x64/recompiler.h

@@ -34,7 +34,7 @@
 #include "profiler.h"
 #include "regAllocation.h"
 #include "spu/interface.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #define HOST_REG_CACHE_OFFSET(x) ((uintptr_t) & m_hostRegisterCache[(x)] - (uintptr_t)this)
 #define GPR_OFFSET(x) ((uintptr_t) & m_regs.GPR.r[(x)] - (uintptr_t)this)

src/core/OpenGL_GPU/gpu_opengl.cc

@@ -29,7 +29,7 @@
 #include "core/system.h"
 #include "fmt/format.h"
 #include "gui/gui.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 std::unique_ptr<PCSX::GPU> PCSX::GPU::getOpenGL() { return std::unique_ptr<PCSX::GPU>(new PCSX::OpenGL_GPU()); }
 

src/core/psxinterpreter.cc

@@ -26,7 +26,7 @@
 #include "core/pgxp_gte.h"
 #include "core/psxemulator.h"
 #include "core/r3000a.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #undef _PC_
 #undef _Op_

src/gpu/soft/gpu.cc

@@ -26,7 +26,7 @@
 #include "gpu/soft/soft.h"
 #include "imgui.h"
 #include "support/imgui-helpers.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #define GPUSTATUS_DMABITS 0x60000000
 #define GPUSTATUS_READYFORCOMMANDS 0x10000000

src/gui/gui.cc

@@ -88,7 +88,7 @@ extern "C" {
 #include "support/uvfile.h"
 #include "support/zfile.h"
 #include "supportpsx/binloader.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #ifdef _WIN32
 extern "C" {

src/main/main.cc

@@ -41,7 +41,7 @@
 #include "support/binpath.h"
 #include "support/uvfile.h"
 #include "support/version.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 static PCSX::UI *s_ui;