From 59f29adc1cc5fe76f6f89aed829162e61c240fb4 Mon Sep 17 00:00:00 2001
From: dcvz <david@dcvz.io>
Date: Wed, 22 May 2024 00:34:18 +0200
Subject: [PATCH] =?UTF-8?q?Within=20ultramodern=20use=20=E2=80=9C=E2=80=9D?=
 =?UTF-8?q?=20syntax=20for=20headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ultramodern/CMakeLists.txt      |  4 ++++
 ultramodern/src/audio.cpp       |  4 ++--
 ultramodern/src/events.cpp      | 10 +++++-----
 ultramodern/src/misc_ultra.cpp  |  2 +-
 ultramodern/src/rt64_layer.cpp  |  2 +-
 ultramodern/src/scheduling.cpp  |  2 +-
 ultramodern/src/threadqueue.cpp |  2 +-
 ultramodern/src/timer.cpp       |  4 ++--
 8 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ultramodern/CMakeLists.txt b/ultramodern/CMakeLists.txt
index c3be9a1..bc16dc0 100644
--- a/ultramodern/CMakeLists.txt
+++ b/ultramodern/CMakeLists.txt
@@ -28,6 +28,10 @@ target_include_directories(ultramodern PUBLIC
     "${CMAKE_SOURCE_DIR}/thirdparty/sse2neon"
 )
 
+target_include_directories(ultramodern PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/ultramodern"
+)
+
 # TODO: remove when rt64 is no longer a hard dependency
 target_include_directories(ultramodern PRIVATE
     "${CMAKE_SOURCE_DIR}/rt64/src"
diff --git a/ultramodern/src/audio.cpp b/ultramodern/src/audio.cpp
index 0ff2dbe..b24e686 100644
--- a/ultramodern/src/audio.cpp
+++ b/ultramodern/src/audio.cpp
@@ -1,5 +1,5 @@
-#include <ultramodern/ultra64.h>
-#include <ultramodern/ultramodern.hpp>
+#include "ultra64.h"
+#include "ultramodern.hpp"
 #include <cassert>
 
 static uint32_t sample_rate = 48000;
diff --git a/ultramodern/src/events.cpp b/ultramodern/src/events.cpp
index f708bf0..9af5568 100644
--- a/ultramodern/src/events.cpp
+++ b/ultramodern/src/events.cpp
@@ -11,11 +11,11 @@
 
 #include "blockingconcurrentqueue.h"
 
-#include <ultramodern/ultra64.h>
-#include <ultramodern/ultramodern.hpp>
-#include <ultramodern/config.hpp>
-#include <ultramodern/rt64_layer.h>
-#include <ultramodern/recomp_ui.h>
+#include "ultra64.h"
+#include "ultramodern.hpp"
+#include "config.hpp"
+#include "rt64_layer.h"
+#include "recomp_ui.h"
 #include "recomp.h"
 #include "recomp_game.h"
 #include "recomp_input.h"
diff --git a/ultramodern/src/misc_ultra.cpp b/ultramodern/src/misc_ultra.cpp
index 5878b6d..c01b9f7 100644
--- a/ultramodern/src/misc_ultra.cpp
+++ b/ultramodern/src/misc_ultra.cpp
@@ -1,4 +1,4 @@
-#include <ultramodern/ultra64.h>
+#include "ultra64.h"
 
 #define K0BASE        0x80000000
 #define K1BASE        0xA0000000
diff --git a/ultramodern/src/rt64_layer.cpp b/ultramodern/src/rt64_layer.cpp
index 9900f34..e82a07f 100644
--- a/ultramodern/src/rt64_layer.cpp
+++ b/ultramodern/src/rt64_layer.cpp
@@ -4,7 +4,7 @@
 
 #define HLSL_CPU
 #include "hle/rt64_application.h"
-#include <ultramodern/rt64_layer.h>
+#include "rt64_layer.h"
 #include "rt64_render_hooks.h"
 
 ultramodern::RT64Context::~RT64Context() = default;
diff --git a/ultramodern/src/scheduling.cpp b/ultramodern/src/scheduling.cpp
index f06a5b4..4af1b98 100644
--- a/ultramodern/src/scheduling.cpp
+++ b/ultramodern/src/scheduling.cpp
@@ -1,4 +1,4 @@
-#include <ultramodern/ultramodern.hpp>
+#include "ultramodern.hpp"
 
 void ultramodern::schedule_running_thread(RDRAM_ARG PTR(OSThread) t_) {
     debug_printf("[Scheduling] Adding thread %d to the running queue\n", TO_PTR(OSThread, t_)->id);
diff --git a/ultramodern/src/threadqueue.cpp b/ultramodern/src/threadqueue.cpp
index 06bf0ad..5869811 100644
--- a/ultramodern/src/threadqueue.cpp
+++ b/ultramodern/src/threadqueue.cpp
@@ -1,6 +1,6 @@
 #include <cassert>
 
-#include <ultramodern/ultramodern.hpp>
+#include "ultramodern.hpp"
 
 static PTR(OSThread) running_queue_impl = NULLPTR;
 
diff --git a/ultramodern/src/timer.cpp b/ultramodern/src/timer.cpp
index f3f522e..b278ff3 100644
--- a/ultramodern/src/timer.cpp
+++ b/ultramodern/src/timer.cpp
@@ -3,8 +3,8 @@
 #include <set>
 #include "blockingconcurrentqueue.h"
 
-#include <ultramodern/ultra64.h>
-#include <ultramodern/ultramodern.hpp>
+#include "ultra64.h"
+#include "ultramodern.hpp"
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN