Merge pull request #1851 from NotExactlySiev/main

Fixing some non-standard includes
grumpycoders · Feb 10, 2025 · b6d20b5 · b6d20b5
2 parents 186005e + cae2449
commit b6d20b5
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 30 deletions.
diff --git a/Makefile b/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

diff --git a/src/cdrom/file.cc b/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) {

diff --git a/src/core/DynaRec_aa64/recompiler.h b/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)

diff --git a/src/core/DynaRec_x64/recompiler.h b/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)

diff --git a/src/core/OpenGL_GPU/gpu_opengl.cc b/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()); }
 

diff --git a/src/core/cdrom.cc b/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"
 

diff --git a/src/core/display.cc b/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;

diff --git a/src/core/gdb-server.cc b/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";

diff --git a/src/core/gpu.cc b/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

diff --git a/src/core/gpu.h b/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"

diff --git a/src/core/kernel.cc b/src/core/kernel.cc
@@ -23,7 +23,7 @@
 
 #include "core/psxmem.h"
 #include "fmt/format.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 enum class Hw {
     VBLANK = 0x00000001,

diff --git a/src/core/logger.h b/src/core/logger.h
@@ -23,7 +23,7 @@
 
 #include "core/system.h"
 #include "fmt/printf.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 namespace PCSX {
 

diff --git a/src/core/pad.cc b/src/core/pad.cc
@@ -33,7 +33,7 @@
 #include "fmt/format.h"
 #include "gui/gui.h"
 #include "imgui.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "support/file.h"
 #include "support/imgui-helpers.h"
 

diff --git a/src/core/psxemulator.cc b/src/core/psxemulator.cc
@@ -45,7 +45,7 @@
 #include "lua/zlibffi.h"
 #include "luafilesystem/src/lfs.h"
 extern "C" {
-#include "luv/src/luv.h"
+#include <luv.h>
 }
 #include "spu/interface.h"
 #include "supportpsx/adpcmlua.h"

diff --git a/src/core/psxinterpreter.cc b/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_

diff --git a/src/core/r3000a.cc b/src/core/r3000a.cc
@@ -33,7 +33,7 @@
 #include "core/sio1.h"
 #include "core/spu.h"
 #include "fmt/format.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 int PCSX::R3000Acpu::psxInit() {
     g_system->printf(_("PCSX-Redux booting\n"));

diff --git a/src/core/web-server.cc b/src/core/web-server.cc
@@ -36,10 +36,10 @@
 #include "core/r3000a.h"
 #include "core/system.h"
 #include "gui/gui.h"
-#include "llhttp/llhttp.h"
+#include <llhttp.h>
 #include "lua/luawrapper.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
-#include "multipart-parser-c/multipart_parser.h"
+#include <magic_enum_all.hpp>
+#include <multipart_parser.h>
 #include "support/file.h"
 #include "support/hashtable.h"
 #include "support/strings-helpers.h"

diff --git a/src/gpu/soft/gpu.cc b/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

diff --git a/src/gui/gui.cc b/src/gui/gui.cc
@@ -78,7 +78,7 @@ extern "C" {
 #include "lua/glffi.h"
 #include "lua/luafile.h"
 #include "lua/luawrapper.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "nanovg/src/nanovg.h"
 #include "nanovg/src/nanovg_gl.h"
 #include "nanovg/src/nanovg_gl_utils.h"
@@ -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" {

diff --git a/src/gui/gui.h b/src/gui/gui.h
@@ -59,7 +59,7 @@
 #include "imgui.h"
 #include "imgui_md/imgui_md.h"
 #include "imgui_memory_editor/imgui_memory_editor.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "support/eventbus.h"
 #include "support/settings.h"
 #include "support/version.h"

diff --git a/src/gui/widgets/log.cc b/src/gui/widgets/log.cc
@@ -25,7 +25,7 @@
 #include "gui/gui.h"
 #include "imgui.h"
 #include "imgui_internal.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 
 PCSX::Widgets::Log::json PCSX::Widgets::Log::serialize() const {
     json ret;

diff --git a/src/gui/widgets/memory_observer.cc b/src/gui/widgets/memory_observer.cc
@@ -23,7 +23,7 @@
 #include <xbyak_util.h>
 #endif
 
-#include <magic_enum/include/magic_enum/magic_enum_all.hpp>
+#include <magic_enum_all.hpp>
 
 #include "core/debug.h"
 #include "core/psxemulator.h"

diff --git a/src/gui/widgets/typed_debugger.cc b/src/gui/widgets/typed_debugger.cc
@@ -21,7 +21,7 @@
 #include "gui/widgets/typed_debugger.h"
 
 #include <fstream>
-#include <magic_enum/include/magic_enum/magic_enum_all.hpp>
+#include <magic_enum_all.hpp>
 #include <regex>
 #include <sstream>
 

diff --git a/src/main/main.cc b/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;
 

diff --git a/src/support/settings.h b/src/support/settings.h
@@ -42,7 +42,7 @@ SOFTWARE.
 #include "core/system.h"
 #include "json.hpp"
 #include "lua/luawrapper.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "support/typestring-wrapper.h"
 #include "typestring.hh"
 

diff --git a/tools/psyq-obj-parser/psyq-obj-parser.cc b/tools/psyq-obj-parser/psyq-obj-parser.cc
@@ -27,7 +27,7 @@
 #include "elfio/elfio.hpp"
 #include "flags.h"
 #include "fmt/format.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
+#include <magic_enum_all.hpp>
 #include "support/djbhash.h"
 #include "support/file.h"
 #include "support/hashtable.h"

diff --git a/vsprojects/common.props b/vsprojects/common.props
@@ -8,7 +8,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)..\src;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\curl\include;$(SolutionDir)..\third_party\ConcurrentQueue;$(SolutionDir)..\third_party\capstone\include\capstone;$(SolutionDir)..\third_party\googletest\googletest\include;$(SolutionDir)..\third_party\ELFIO;$(SolutionDir)..\third_party\expected\include;$(SolutionDir)..\third_party\fmt\include;$(SolutionDir)..\third_party\freetype\include;$(SolutionDir)..\third_party\gl3w;$(SolutionDir)..\third_party\imgui;$(SolutionDir)..\third_party\imgui\backends;$(SolutionDir)..\third_party\imgui\misc\cpp;$(SolutionDir)..\third_party\libuv\include;$(SolutionDir)..\third_party\libuv\src;$(SolutionDir)..\third_party\md4c\src;$(SolutionDir)..\third_party\SDL\include;$(SolutionDir)..\third_party\uriparser\include;$(SolutionDir)..\third_party\uvw\src;$(SolutionDir)..\third_party\xbyak\xbyak;$(SolutionDir)..\third_party\zep\extensions;$(SolutionDir)..\third_party\zep\include;$(SolutionDir)..\third_party\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)..\src;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\curl\include;$(SolutionDir)..\third_party\ConcurrentQueue;$(SolutionDir)..\third_party\capstone\include\capstone;$(SolutionDir)..\third_party\googletest\googletest\include;$(SolutionDir)..\third_party\ELFIO;$(SolutionDir)..\third_party\expected\include;$(SolutionDir)..\third_party\fmt\include;$(SolutionDir)..\third_party\freetype\include;$(SolutionDir)..\third_party\gl3w;$(SolutionDir)..\third_party\imgui;$(SolutionDir)..\third_party\imgui\backends;$(SolutionDir)..\third_party\imgui\misc\cpp;$(SolutionDir)..\third_party\libuv\include;$(SolutionDir)..\third_party\libuv\src;$(SolutionDir)..\third_party\llhttp;$(SolutionDir)..\third_party\luv\src;$(SolutionDir)..\third_party\magic_enum\include\magic_enum;$(SolutionDir)..\third_party\md4c\src;$(SolutionDir)..\third_party\multipart-parser-c;$(SolutionDir)..\third_party\SDL\include;$(SolutionDir)..\third_party\tracy\public;$(SolutionDir)..\third_party\uriparser\include;$(SolutionDir)..\third_party\uvw\src;$(SolutionDir)..\third_party\xbyak\xbyak;$(SolutionDir)..\third_party\zep\extensions;$(SolutionDir)..\third_party\zep\include;$(SolutionDir)..\third_party\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <PreprocessorDefinitions>IMGUI_ENABLE_FREETYPE;IMGUI_DISABLE_OBSOLETE_KEYIO;HAVE_STDINT_H;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_GNU_SOURCE;NOMINMAX;WIN32;_WINDOWS;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;ZEP_FEATURE_CPP_FILE_SYSTEM;CURL_STATICLIB;BUILDING_LIBCURL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;USE_SCHANNEL;PB_STATIC_API;WINVER=0x0602;_WIN32_WINNT=0x0602;URI_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -23,4 +23,4 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>