Fix compile errors when certain options are disabled by 'configure'.

src/common/SoundNull.hxx

@@ -51,10 +51,9 @@ class SoundNull : public Sound
     /**
       Enables/disables the sound subsystem.
 
-      @param enable  Either true or false, to enable or disable the sound system
+      @param state  True or false, to enable or disable the sound system
-      @return        Whether the sound system was enabled or disabled
     */
-    void setEnabled(bool enable) override { }
+    void setEnabled(bool state) override { }
 
     /**
       Sets the number of channels (mono or stereo sound).
@@ -93,7 +92,7 @@ class SoundNull : public Sound
     /**
       Reset the sound device.
     */
-    void reset() { }
+    void reset() override { }
 
     /**
       Sets the sound register to a given value.
@@ -128,7 +127,7 @@ class SoundNull : public Sound
       @param out The serializer device to save to.
       @return The result of the save.  True on success, false on failure.
     */
-    bool save(Serializer& out) const
+    bool save(Serializer& out) const override
     {
       out.putString("TIASound");
 
@@ -147,7 +146,7 @@ class SoundNull : public Sound
       @param in The Serializer device to load from.
       @return The result of the load.  True on success, false on failure.
     */
-    bool load(Serializer& in)
+    bool load(Serializer& in) override
     {
       if(in.getString() != "TIASound")
         return false;
@@ -167,7 +166,7 @@ class SoundNull : public Sound
 
       @return The name of the object
     */
-    string name() const { return "TIASound"; }
+    string name() const override { return "TIASound"; }
 
   private:
     // Following constructors and assignment operators not supported

src/emucore/Cart.cxx

@@ -16,6 +16,7 @@
 //============================================================================
 
 #include "Settings.hxx"
+#include "System.hxx"
 #ifdef DEBUGGER_SUPPORT
   #include "Debugger.hxx"
   #include "CartDebug.hxx"

src/emucore/CartFE.cxx

@@ -15,6 +15,7 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
+#include "M6532.hxx"
 #include "System.hxx"
 #include "CartFE.hxx"
 

src/emucore/M6532.cxx

@@ -39,8 +39,7 @@ M6532::M6532(const Console& console, const Settings& settings)
     mySetTimerCycle(0), myLastCycle(0),
     myDDRA(0), myDDRB(0), myOutA(0), myOutB(0),
     myInterruptFlag(false),
-    myEdgeDetectPositive(false),
+    myEdgeDetectPositive(false)
-    myRAMAccessBase(nullptr)
 {
 }
 

src/emucore/tia/TIA.hxx

@@ -750,17 +750,16 @@ class TIA : public Device
     bool myEnableJitter;
     uInt8 myJitterFactor;
 
-
 #ifdef DEBUGGER_SUPPORT
     // The arrays containing information about every byte of TIA
     // indicating whether and how (RW) it is used.
     BytePtr myAccessBase;
     // The array used to skip the first two TIA access trackings
     BytePtr myAccessDelay;
+#endif // DEBUGGER_SUPPORT
 
     static constexpr uInt16
       TIA_SIZE = 0x40, TIA_MASK = TIA_SIZE - 1, TIA_READ_MASK = 0x0f, TIA_BIT = 0x080, TIA_DELAY = 2;
-#endif // DEBUGGER_SUPPORT
 
   private:
     TIA() = delete;

src/gui/UIDialog.cxx

@@ -384,6 +384,7 @@ void UIDialog::saveConfig()
   instance().settings().setValue("exitlauncher",
     myLauncherExitPopup->getSelectedTag().toString());
 
+#ifdef DEBUGGER_SUPPORT
   // Debugger size
   instance().settings().setValue("dbg.res",
     GUI::Size(myDebuggerWidthSlider->getValue(),
@@ -392,6 +393,7 @@ void UIDialog::saveConfig()
   // Debugger font style
   instance().settings().setValue("dbg.fontstyle",
     myDebuggerFontStyle->getSelectedTag().toString());
+#endif
 
   // UI palette
   instance().settings().setValue("uipalette",

src/gui/UIDialog.hxx

@@ -55,12 +55,14 @@ class UIDialog : public Dialog
     PopUpWidget*      myLauncherFontPopup;
     PopUpWidget*      myRomViewerPopup;
 
+#ifdef DEBUGGER_SUPPORT
     // Debugger options
     SliderWidget*     myDebuggerWidthSlider;
     StaticTextWidget* myDebuggerWidthLabel;
     SliderWidget*     myDebuggerHeightSlider;
     StaticTextWidget* myDebuggerHeightLabel;
     PopUpWidget*      myDebuggerFontStyle;
+#endif
 
     // Misc options
     PopUpWidget*      myPalettePopup;

src/gui/VideoDialog.cxx

@@ -382,7 +382,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
 
   // Disable certain functions when we know they aren't present
 #ifndef WINDOWED_SUPPORT
-  myFullscreenCheckbox->clearFlags(WIDGET_ENABLED);
+  myFullscreen->clearFlags(WIDGET_ENABLED);
   myCenter->clearFlags(WIDGET_ENABLED);
 #endif
 }