From 84e111290f3773b0999cad109c9d0aa037253334 Mon Sep 17 00:00:00 2001
From: Maxim Poliakovski <maximumspatium@googlemail.com>
Date: Thu, 16 Sep 2021 00:46:38 +0200
Subject: [PATCH] Fix includes for loguru and SDL.

---
 cpu/ppc/CMakeLists.txt         | 3 ++-
 cpu/ppc/poweropcodes.cpp       | 2 +-
 cpu/ppc/ppcexec.cpp            | 2 +-
 cpu/ppc/ppcfpopcodes.cpp       | 2 +-
 cpu/ppc/ppcmmu.cpp             | 2 +-
 cpu/ppc/ppcopcodes.cpp         | 2 +-
 debugger/CMakeLists.txt        | 1 +
 debugger/debugger.cpp          | 2 +-
 devices/CMakeLists.txt         | 1 +
 devices/adb.cpp                | 2 +-
 devices/atirage.cpp            | 2 +-
 devices/awacs.cpp              | 2 +-
 devices/awacs.h                | 1 -
 devices/dbdma.cpp              | 2 +-
 devices/displayid.cpp          | 2 +-
 devices/heathrow.cpp           | 2 +-
 devices/i2c.h                  | 2 +-
 devices/mpc106.cpp             | 2 +-
 devices/nvram.cpp              | 2 +-
 devices/soundserver.cpp        | 2 +-
 devices/spdram.h               | 2 +-
 devices/viacuda.cpp            | 2 +-
 execution/CMakeLists.txt       | 3 ++-
 execution/interpreter_loop.cpp | 4 ++--
 machines/CMakeLists.txt        | 3 ++-
 machines/machinebase.cpp       | 2 +-
 machines/machinefactory.cpp    | 2 +-
 machines/machinegossamer.cpp   | 2 +-
 machines/machineproperties.h   | 4 ++--
 main.cpp                       | 6 +++---
 memaccess.h                    | 2 +-
 31 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/cpu/ppc/CMakeLists.txt b/cpu/ppc/CMakeLists.txt
index 02905d7..ce7b3c4 100644
--- a/cpu/ppc/CMakeLists.txt
+++ b/cpu/ppc/CMakeLists.txt
@@ -1,4 +1,5 @@
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 
diff --git a/cpu/ppc/poweropcodes.cpp b/cpu/ppc/poweropcodes.cpp
index 3ce0e2c..73b61b9 100644
--- a/cpu/ppc/poweropcodes.cpp
+++ b/cpu/ppc/poweropcodes.cpp
@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <limits>
 #include <stdexcept>
 #include <stdio.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 // Affects the XER register's SO and OV Bits
 
diff --git a/cpu/ppc/ppcexec.cpp b/cpu/ppc/ppcexec.cpp
index 124f16f..a5afe38 100644
--- a/cpu/ppc/ppcexec.cpp
+++ b/cpu/ppc/ppcexec.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <stdio.h>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <unordered_map>
 
 #include "ppcemu.h"
diff --git a/cpu/ppc/ppcfpopcodes.cpp b/cpu/ppc/ppcfpopcodes.cpp
index b4d6d43..bb202a7 100644
--- a/cpu/ppc/ppcfpopcodes.cpp
+++ b/cpu/ppc/ppcfpopcodes.cpp
@@ -33,7 +33,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <stdio.h>
 #include <unordered_map>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 // Used for FP calcs
 uint64_t ppc_result64_b;
diff --git a/cpu/ppc/ppcmmu.cpp b/cpu/ppc/ppcmmu.cpp
index 6763602..a866199 100644
--- a/cpu/ppc/ppcmmu.cpp
+++ b/cpu/ppc/ppcmmu.cpp
@@ -37,7 +37,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <iostream>
 #include <stdexcept>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /* pointer to exception handler to be called when a MMU exception is occured. */
 void (*mmu_exception_handler)(Except_Type exception_type, uint32_t srr1_bits);
diff --git a/cpu/ppc/ppcopcodes.cpp b/cpu/ppc/ppcopcodes.cpp
index 5283b99..ca632f3 100644
--- a/cpu/ppc/ppcopcodes.cpp
+++ b/cpu/ppc/ppcopcodes.cpp
@@ -31,7 +31,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <thread>
 #include <vector>
 
diff --git a/debugger/CMakeLists.txt b/debugger/CMakeLists.txt
index 50d4d11..b8ae0a7 100644
--- a/debugger/CMakeLists.txt
+++ b/debugger/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
                     "${PROJECT_SOURCE_DIR}/thirdparty/capstone/include")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
diff --git a/debugger/debugger.cpp b/debugger/debugger.cpp
index 983d824..763979d 100644
--- a/debugger/debugger.cpp
+++ b/debugger/debugger.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <sstream>
 #include <stdio.h>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include "../cpu/ppc/ppcdisasm.h"
 #include "../cpu/ppc/ppcemu.h"
 #include "../cpu/ppc/ppcmmu.h"
diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index b289569..7913765 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
                     "${PROJECT_SOURCE_DIR}/thirdparty/SDL2/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
diff --git a/devices/adb.cpp b/devices/adb.cpp
index 42ce4ee..842c3eb 100644
--- a/devices/adb.cpp
+++ b/devices/adb.cpp
@@ -37,7 +37,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <thirdparty/SDL2/include/SDL_stdinc.h>
 #endif
 
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 
diff --git a/devices/atirage.cpp b/devices/atirage.cpp
index 8e226bf..3772cd7 100644
--- a/devices/atirage.cpp
+++ b/devices/atirage.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <chrono>
 #include <cstdint>
 #include <map>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /* Mach64 post dividers. */
 static const int mach64_post_div[8] = {
diff --git a/devices/awacs.cpp b/devices/awacs.cpp
index d5e2422..78ef3ce 100644
--- a/devices/awacs.cpp
+++ b/devices/awacs.cpp
@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "machines/machinebase.h"
 #include "soundserver.h"
 #include <algorithm>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 static int awac_freqs[8] = {44100, 29400, 22050, 17640, 14700, 11025, 8820, 7350};
 
diff --git a/devices/awacs.h b/devices/awacs.h
index a0bce25..4522e30 100644
--- a/devices/awacs.h
+++ b/devices/awacs.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "i2c.h"
 #include "soundserver.h"
 #include <cinttypes>
-#include <thirdparty/SDL2/include/SDL.h>
 
 /** AWAC registers offsets. */
 enum {
diff --git a/devices/dbdma.cpp b/devices/dbdma.cpp
index bfd1b6c..a654f26 100644
--- a/devices/dbdma.cpp
+++ b/devices/dbdma.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "endianswap.h"
 #include <cinttypes>
 #include <cstring>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 void DMAChannel::get_next_cmd(uint32_t cmd_addr, DMACmd* p_cmd) {
     /* load DMACmd from physical memory */
diff --git a/devices/displayid.cpp b/devices/displayid.cpp
index 99a5898..e7c02d0 100644
--- a/devices/displayid.cpp
+++ b/devices/displayid.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 #include "displayid.h"
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include "SDL.h"
 
 DisplayID::DisplayID() {
diff --git a/devices/heathrow.cpp b/devices/heathrow.cpp
index bbb28a9..8398960 100644
--- a/devices/heathrow.cpp
+++ b/devices/heathrow.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "viacuda.h"
 #include <cinttypes>
 #include <iostream>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <cpu/ppc/ppcemu.h>
 
 /** Heathrow Mac I/O device emulation.
diff --git a/devices/i2c.h b/devices/i2c.h
index 7320d7c..50a2b67 100644
--- a/devices/i2c.h
+++ b/devices/i2c.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <cstring>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /** Base class for I2C devices */
 class I2CDevice {
diff --git a/devices/mpc106.cpp b/devices/mpc106.cpp
index 5efdfc3..41e2281 100644
--- a/devices/mpc106.cpp
+++ b/devices/mpc106.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cinttypes>
 #include <cstring>
 #include <iostream>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 #include "hwcomponent.h"
 #include "memctrlbase.h"
diff --git a/devices/nvram.cpp b/devices/nvram.cpp
index 9829304..cd88e9a 100644
--- a/devices/nvram.cpp
+++ b/devices/nvram.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /** @file Non-volatile RAM implementation.
  */
diff --git a/devices/soundserver.cpp b/devices/soundserver.cpp
index 106da46..fb58c2c 100644
--- a/devices/soundserver.cpp
+++ b/devices/soundserver.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "soundserver.h"
 //#include <thirdparty/libsoundio/soundio/soundio.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <cubeb/cubeb.h>
 #ifdef _WIN32
 #include <objbase.h>
diff --git a/devices/spdram.h b/devices/spdram.h
index be49849..dacb84a 100644
--- a/devices/spdram.h
+++ b/devices/spdram.h
@@ -52,7 +52,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cinttypes>
 #include <stdexcept>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 enum RAMType : int { SDRAM = 4 };
 
diff --git a/devices/viacuda.cpp b/devices/viacuda.cpp
index 8a2f2ef..13d329e 100644
--- a/devices/viacuda.cpp
+++ b/devices/viacuda.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "viacuda.h"
 #include "adb.h"
 #include <cinttypes>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 
diff --git a/execution/CMakeLists.txt b/execution/CMakeLists.txt
index 7e5ac0d..f3aca83 100644
--- a/execution/CMakeLists.txt
+++ b/execution/CMakeLists.txt
@@ -1,4 +1,5 @@
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 
diff --git a/execution/interpreter_loop.cpp b/execution/interpreter_loop.cpp
index 8b70ed2..26e4433 100644
--- a/execution/interpreter_loop.cpp
+++ b/execution/interpreter_loop.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <ctime>
 #include <iostream>
 #include <interpreter_loop.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <cpu/ppc/ppcemu.h>
 
 std::chrono::high_resolution_clock::time_point global;        // global timer
@@ -108,4 +108,4 @@ void interpreter_main_loop() {
 
         interpreter_update_counters();
     }
-}
\ No newline at end of file
+}
diff --git a/machines/CMakeLists.txt b/machines/CMakeLists.txt
index c72473c..ed697c6 100644
--- a/machines/CMakeLists.txt
+++ b/machines/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(CMAKE_CXX_STANDARD 11)
 
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 
diff --git a/machines/machinebase.cpp b/machines/machinebase.cpp
index f992608..3c4b821 100644
--- a/machines/machinebase.cpp
+++ b/machines/machinebase.cpp
@@ -3,7 +3,7 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 std::unique_ptr<MachineBase> gMachineObj = 0;
 
diff --git a/machines/machinefactory.cpp b/machines/machinefactory.cpp
index 743fed8..54a7c46 100644
--- a/machines/machinefactory.cpp
+++ b/machines/machinefactory.cpp
@@ -37,7 +37,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <map>
 #include <memory>
 #include <vector>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 
diff --git a/machines/machinegossamer.cpp b/machines/machinegossamer.cpp
index 4a3062a..92125e6 100644
--- a/machines/machinegossamer.cpp
+++ b/machines/machinegossamer.cpp
@@ -34,7 +34,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "devices/viacuda.h"
 #include "machinebase.h"
 #include "machineproperties.h"
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 
 static void setup_ram_slot(std::string name, int i2c_addr, int capacity_megs) {
diff --git a/machines/machineproperties.h b/machines/machineproperties.h
index 3bcf7be..884e9ce 100644
--- a/machines/machineproperties.h
+++ b/machines/machineproperties.h
@@ -1,11 +1,11 @@
 #include "endianswap.h"
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <algorithm>
 #include <cinttypes>
 #include <string>
 #include <map>
 #include <memory>
-#include <limits> 
+#include <limits>
 #include <sstream>
 #include <utility>
 #include <vector>
diff --git a/main.cpp b/main.cpp
index 328cfc9..8aa3706 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,9 +35,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
-#include <thirdparty/CLI11/CLI11.hpp>
-#include <thirdparty/SDL2/include/SDL.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <CLI11.hpp>
+#include <SDL.h>
+#include <loguru.hpp>
 
 using namespace std;
 
diff --git a/memaccess.h b/memaccess.h
index 8f25d12..6fd0260 100644
--- a/memaccess.h
+++ b/memaccess.h
@@ -7,7 +7,7 @@
 
 #include "endianswap.h"
 #include <cinttypes>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /* read an aligned big-endian WORD (16bit) */
 #define READ_WORD_BE_A(addr) (BYTESWAP_16(*((uint16_t*)((addr)))))