Fix includes for loguru and SDL.

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")
 

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
 

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"

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;

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);

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>
 

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")

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"

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")

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;
 

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] = {

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};
 

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 {

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 */

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() {

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.

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 {

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"

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.
  */

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>

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 };
 

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;
 

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")
 

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();
     }
-}
+}

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")
 

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;
 

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;
 

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) {

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>

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;
 

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)))))