separate option for enabling gdbstub

CMakeLists.txt

@@ -99,6 +99,16 @@ if (CCACHE)
     set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
 endif()
 
+option(ENABLE_GDBSTUB "Enable GDB stub" OFF)
+if (ENABLE_GDBSTUB)
+    add_definitions(-DGDBSTUB_ENABLED)
+endif()
+
+if (NOT WIN32)
+    add_compile_options(-fno-pic)
+    add_link_options(-no-pie)
+endif()
+
 option(BUILD_QT_SDL "Build Qt/SDL frontend" ON)
 
 add_subdirectory(src)

src/ARM.cpp

@@ -36,7 +36,6 @@ using Platform::Log;
 using Platform::LogLevel;
 
 #ifdef GDBSTUB_ENABLED
-
 #define GDB_CHECK_A() do{\
         if (!is_single_step && !break_req) { /* check if eg. break signal is incoming etc. */ \
             enum gdbstub_state st = gdbstub_enter(stub, false); \

src/ARMInterpreter.cpp

@@ -28,7 +28,7 @@ using Platform::Log;
 using Platform::LogLevel;
 
 #ifdef GDBSTUB_ENABLED
-#include "debug/hypervisor.h"
+#include "debug/gdbstub.h"
 #endif
 
 namespace ARMInterpreter

src/types.h

@@ -19,21 +19,6 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-<<<<<<< HEAD
-=======
-#ifdef __cplusplus
-#define TYPES_TESTVAR __cplusplus
-#define TYPES_TESTVAL 201103L
-#else
-#define TYPES_TESTVAR __STDC_VERSION__
-#define TYPES_TESTVAL 201112L
-#endif
-
-#if TYPES_TESTVAR >= TYPES_TESTVAL
-
-// use the C++11/C11 defines because they're most likely more correct
-
->>>>>>> e045f0d (holy fuck the gdbstub works)
 #include <stdint.h>
 
 typedef uint8_t     u8;