fix build on some ARM toolchains

R1 redefined..

diff --git a/frontend/main.c b/frontend/main.c
index 498e780..37a72ac 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -27,6 +27,10 @@
 #include "common/input.h"
 #include "common/readpng.h"
 
+// don't include debug.h - it breaks ARM build (R1 redefined)
+void StartDebugger();
+void StopDebugger();
+
 int ready_to_go;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];

diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 9f12e3b..cb808ec 100644 (file)
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -69,7 +69,6 @@ typedef uint8_t boolean;
 
 // Local includes
 #include "system.h"
-#include "debug.h"
 
 #if defined (__LINUX__) || defined (__MACOSX__)
 #define strnicmp strncasecmp

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 184a4c9..fc4c5b1 100644 (file)
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -22,6 +22,7 @@
  */
 
 #include "psxcounters.h"
+#include "debug.h"
 
 /******************************************************************************/
 

diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index 8eb4749..33616e5 100644 (file)
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -25,6 +25,7 @@
 #include "r3000a.h"
 #include "gte.h"
 #include "psxhle.h"
+#include "debug.h"
 
 static int branch = 0;
 static int branch2 = 0;

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index b08d113..8c7c37b 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -26,6 +26,7 @@
 #include "psxmem.h"
 #include "r3000a.h"
 #include "psxhw.h"
+#include "debug.h"
 #include <sys/mman.h>
 
 #ifndef MAP_ANONYMOUS