From fc8145b709406b946c1d5527ff89ed419596fd17 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 23 Sep 2011 03:07:38 +0300 Subject: [PATCH] fix build on some ARM toolchains R1 redefined.. --- frontend/main.c | 4 ++++ libpcsxcore/psxcommon.h | 1 - libpcsxcore/psxcounters.c | 1 + libpcsxcore/psxinterpreter.c | 1 + libpcsxcore/psxmem.c | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/main.c b/frontend/main.c index 498e7806..37a72ac7 100644 --- 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 9f12e3bb..cb808ec0 100644 --- 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 184a4c9c..fc4c5b1d 100644 --- 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 8eb4749d..33616e55 100644 --- 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 b08d113d..8c7c37b6 100644 --- 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 #ifndef MAP_ANONYMOUS -- 2.39.2