Merge pull request #1851 from NotExactlySiev/main

Fixing some non-standard includes

Author: nicolasnoble

Makefile

@@ -32,10 +32,14 @@ CPPFLAGS += -Ithird_party/imgui/backends
 CPPFLAGS += -Ithird_party/imgui/examples
 CPPFLAGS += -Ithird_party/imgui/misc/cpp
 CPPFLAGS += -Ithird_party/libelfin
+CPPFLAGS += -Ithird_party/llhttp
 CPPFLAGS += -Ithird_party/luajit/src
 CPPFLAGS += -Ithird_party/luv/src
 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/cdrom/file.cc

@@ -21,7 +21,7 @@
 
 #include "cdrom/cdriso.h"
 #include "iec-60908b/edcecc.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 PCSX::CDRIsoFile::CDRIsoFile(std::shared_ptr<CDRIso> iso, uint32_t lba, int32_t size, SectorMode mode)
     : File(RW_SEEKABLE), m_iso(iso), m_lba(lba) {

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/cdrom.cc

@@ -27,7 +27,7 @@
 #include "core/debug.h"
 #include "core/psxdma.h"
 #include "core/psxemulator.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "spu/interface.h"
 #include "support/strings-helpers.h"
 

src/core/display.cc

@@ -20,7 +20,7 @@
 
 #include "core/gpu.h"
 #include "core/psxemulator.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 void PCSX::GPU::Display::reset() {
     x1 = 0x200;

src/core/gdb-server.cc

@@ -28,7 +28,7 @@
 #include "core/r3000a.h"
 #include "core/system.h"
 #include "fmt/format.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "support/strings-helpers.h"
 
 const char PCSX::GdbClient::toHex[] = "0123456789ABCDEF";

src/core/gpu.cc

@@ -28,7 +28,7 @@
 #include "core/psxhw.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_internal.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 #define GPUSTATUS_READYFORVRAM 0x08000000
 #define GPUSTATUS_IDLE 0x04000000  // CMD ready

src/core/gpu.h

@@ -31,7 +31,7 @@
 
 #include "core/psxemulator.h"
 #include "core/psxmem.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "support/eventbus.h"
 #include "support/file.h"
 #include "support/list.h"