From 30fec1ee896a3924ece7019c0d73fa434ce9152b Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sun, 29 Mar 2020 18:36:26 +0200
Subject: [PATCH] add some more DEBUGGER_SUPPORT defines

---
 src/emucore/Cart4A50.cxx | 2 ++
 src/emucore/Cart4A50.hxx | 3 ++-
 src/emucore/CartAR.cxx   | 2 ++
 src/emucore/CartAR.hxx   | 2 ++
 src/emucore/System.hxx   | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/emucore/Cart4A50.cxx b/src/emucore/Cart4A50.cxx
index fd05804d4..f8f144667 100644
--- a/src/emucore/Cart4A50.cxx
+++ b/src/emucore/Cart4A50.cxx
@@ -181,6 +181,7 @@ bool Cartridge4A50::poke(uInt16 address, uInt8 value)
   return myBankChanged;
 }
 
+#ifdef DEBUGGER_SUPPORT
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Device::AccessFlags Cartridge4A50::getAccessFlags(uInt16 address) const
 {
@@ -243,6 +244,7 @@ void Cartridge4A50::setAccessFlags(uInt16 address, Device::AccessFlags flags)
     myCodeAccessBase[(address & 0xff) + 0x1ff00] |= flags;
   }
 }
+#endif
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge4A50::checkBankSwitch(uInt16 address, uInt8 value)
diff --git a/src/emucore/Cart4A50.hxx b/src/emucore/Cart4A50.hxx
index d55ec8d2f..e68bb8f4a 100644
--- a/src/emucore/Cart4A50.hxx
+++ b/src/emucore/Cart4A50.hxx
@@ -153,6 +153,7 @@ class Cartridge4A50 : public Cartridge
     bool poke(uInt16 address, uInt8 value) override;
 
   private:
+  #ifdef DEBUGGER_SUPPORT
     /**
       Query the given address type for the associated access flags.
 
@@ -166,7 +167,7 @@ class Cartridge4A50 : public Cartridge
       @param flags    A bitfield of AccessType directives for the given address
     */
     void setAccessFlags(uInt16 address, Device::AccessFlags flags) override;
-
+  #endif
     /**
       Check all possible hotspots
     */
diff --git a/src/emucore/CartAR.cxx b/src/emucore/CartAR.cxx
index 42d12c0fd..e5755d6dd 100644
--- a/src/emucore/CartAR.cxx
+++ b/src/emucore/CartAR.cxx
@@ -190,6 +190,7 @@ bool CartridgeAR::poke(uInt16 addr, uInt8)
   return modified;
 }
 
+#ifdef DEBUGGER_SUPPORT
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Device::AccessFlags CartridgeAR::getAccessFlags(uInt16 address) const
 {
@@ -203,6 +204,7 @@ void CartridgeAR::setAccessFlags(uInt16 address, Device::AccessFlags flags)
   myCodeAccessBase[(address & 0x07FF) +
     myImageOffset[(address & 0x0800) ? 1 : 0]] |= flags;
 }
+#endif
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool CartridgeAR::bankConfiguration(uInt8 configuration)
diff --git a/src/emucore/CartAR.hxx b/src/emucore/CartAR.hxx
index 877817c1b..6fda35f38 100644
--- a/src/emucore/CartAR.hxx
+++ b/src/emucore/CartAR.hxx
@@ -159,6 +159,7 @@ class CartridgeAR : public Cartridge
     bool poke(uInt16 address, uInt8 value) override;
 
   private:
+  #ifdef DEBUGGER_SUPPORT
     /**
       Query the given address type for the associated access flags.
 
@@ -172,6 +173,7 @@ class CartridgeAR : public Cartridge
       @param flags    A bitfield of AccessType directives for the given address
     */
     void setAccessFlags(uInt16 address, Device::AccessFlags flags) override;
+  #endif
 
     // Handle a change to the bank configuration
     bool bankConfiguration(uInt8 configuration);
diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx
index 2e7c158a9..1262b6ad3 100644
--- a/src/emucore/System.hxx
+++ b/src/emucore/System.hxx
@@ -231,6 +231,7 @@ class System : public Serializable
     void lockDataBus()   { myDataBusLocked = true;  }
     void unlockDataBus() { myDataBusLocked = false; }
 
+  #ifdef DEBUGGER_SUPPORT
     /**
       Access and modify the access type flags for the given
       address.  Note that while any flag can be used, the disassembly
@@ -238,6 +239,7 @@ class System : public Serializable
     */
     Device::AccessFlags getAccessFlags(uInt16 address) const;
     void setAccessFlags(uInt16 address, Device::AccessFlags flags);
+  #endif
 
   public:
     /**