diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e0dd84..bee6e1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
if (NOT WIN32)
find_package(SDL2 REQUIRED)
include_directories(${SDL2_INCLUDE_DIRS})
+else()
+include_directories("${PROJECT_SOURCE_DIR}/thirdparty/SDL2/include/")
if (UNIX AND NOT APPLE)
find_package (Threads)
endif()
@@ -82,6 +84,8 @@ include_directories("${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/devices"
"${PROJECT_SOURCE_DIR}/debugger"
"${PROJECT_SOURCE_DIR}/utils"
"${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
+ "${PROJECT_SOURCE_DIR}/thirdparty/CLI11/"
+# ${SDL2_INCLUDE_DIRS})
"${PROJECT_SOURCE_DIR}/thirdparty/SDL2/")
# "${PROJECT_SOURCE_DIR}/thirdparty/cubeb/include")
# ${LIBSOUNDIO_HEADERS})
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 .
#include
#include
#include
-#include
+#include
// Affects the XER register's SO and OV Bits
diff --git a/cpu/ppc/ppcexec.cpp b/cpu/ppc/ppcexec.cpp
index 141dda0..752d868 100644
--- a/cpu/ppc/ppcexec.cpp
+++ b/cpu/ppc/ppcexec.cpp
@@ -26,7 +26,7 @@ along with this program. If not, see .
#include
#include
#include
-#include
+#include
#include
#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 .
#include
#include
#include
-#include
+#include
// Used for FP calcs
uint64_t ppc_result64_b;
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 .
#include
#include
#include
-#include
+#include
#include
#include
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 3af759b..00b3fa9 100644
--- a/debugger/debugger.cpp
+++ b/debugger/debugger.cpp
@@ -27,7 +27,7 @@ along with this program. If not, see .
#include
#include
#include
-#include
+#include
#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 21193b6..7913765 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -1,4 +1,6 @@
-include_directories("${PROJECT_SOURCE_DIR}")
+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 .
#include
#endif
-#include
+#include
using namespace std;
diff --git a/devices/atirage.cpp b/devices/atirage.cpp
index 0a68d11..3772cd7 100644
--- a/devices/atirage.cpp
+++ b/devices/atirage.cpp
@@ -24,9 +24,10 @@ along with this program. If not, see .
#include "memaccess.h"
#include "pcidevice.h"
#include
+#include
#include
#include