From 644dc076041a43583dddd96c19148aa22cf5d2f6 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 30 May 2025 15:27:10 -0230 Subject: [PATCH] Removed R77 support. Did it all in one commit, so it can be reverted if necessary. But I don't think we will, since SDL3 will not support that device. --- configure | 16 -- src/common/FBBackendSDL.cxx | 2 +- src/common/MediaFactory.hxx | 17 +- src/common/PJoystickHandler.cxx | 34 +--- src/common/PKeyboardHandler.cxx | 24 +-- src/emucore/EventHandlerConstants.hxx | 8 - src/emucore/TIASurface.cxx | 15 +- src/emucore/Thumbulator.hxx | 4 +- src/gui/DeveloperDialog.cxx | 8 - src/gui/Dialog.cxx | 13 -- src/gui/InputDialog.cxx | 5 - src/gui/LauncherDialog.cxx | 36 ---- src/gui/R77HelpDialog.cxx | 278 -------------------------- src/gui/R77HelpDialog.hxx | 68 ------- src/gui/StellaSettingsDialog.cxx | 4 - src/gui/StellaSettingsDialog.hxx | 10 +- src/gui/WhatsNewDialog.cxx | 18 -- src/gui/Widget.cxx | 6 - src/gui/module.mk | 1 - src/os/unix/FSNodePOSIX.cxx | 12 +- src/os/unix/r77/OSystemR77.cxx | 25 --- src/os/unix/r77/OSystemR77.hxx | 62 ------ src/os/unix/r77/SettingsR77.cxx | 86 -------- src/os/unix/r77/SettingsR77.hxx | 46 ----- src/os/unix/r77/module.mk | 13 -- src/os/windows/Stella.vcxproj | 2 - src/os/windows/Stella.vcxproj.filters | 6 - 27 files changed, 15 insertions(+), 804 deletions(-) delete mode 100644 src/gui/R77HelpDialog.cxx delete mode 100644 src/gui/R77HelpDialog.hxx delete mode 100644 src/os/unix/r77/OSystemR77.cxx delete mode 100644 src/os/unix/r77/OSystemR77.hxx delete mode 100644 src/os/unix/r77/SettingsR77.cxx delete mode 100644 src/os/unix/r77/SettingsR77.hxx delete mode 100644 src/os/unix/r77/module.mk diff --git a/configure b/configure index 2c7e80755..8206d93cf 100755 --- a/configure +++ b/configure @@ -335,9 +335,6 @@ case $_host in # _host_os=amigaos # _host_cpu=ppc # ;; -retron77) - _host_os=retron77 - ;; mingw32-cross) _host_os=mingw32msvc _host_cpu=i386 @@ -558,14 +555,6 @@ fi if test -n "$_host"; then # Cross-compiling mode - add your target here if needed case "$_host" in - retron77) - echo "Compiling for $_host, disabling windowed mode, debugger and cheats." - _build_gui=yes - _build_windowed=no - _build_debugger=no - _build_cheats=no - _build_httplib=no - ;; mingw32-cross) echo "Cross-compiling for Windows using MinGW." DEFINES="$DEFINES -DWIN32" @@ -876,11 +865,6 @@ case $_host_os in fi _libsqlite3=no ;; - retron77) - DEFINES="$DEFINES -DBSPF_UNIX -DRETRON77" - MODULES="$MODULES $SRC_OS/unix $SRC_OS/unix/r77" - INCLUDES="$INCLUDES -I$SRC_OS/unix -I$SRC_OS/unix/r77" - ;; win32) DEFINES="$DEFINES -DBSPF_WINDOWS" MODULES="$MODULES $SRC_OS/windows" diff --git a/src/common/FBBackendSDL.cxx b/src/common/FBBackendSDL.cxx index a4509434c..f6e4de754 100644 --- a/src/common/FBBackendSDL.cxx +++ b/src/common/FBBackendSDL.cxx @@ -581,7 +581,7 @@ void FBBackendSDL::renderToScreen() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FBBackendSDL::setWindowIcon() { -#if !defined(BSPF_MACOS) && !defined(RETRON77) +#if !defined(BSPF_MACOS) #include "stella_icon.hxx" ASSERT_MAIN_THREAD; diff --git a/src/common/MediaFactory.hxx b/src/common/MediaFactory.hxx index 4147f2f1b..f71742ddc 100644 --- a/src/common/MediaFactory.hxx +++ b/src/common/MediaFactory.hxx @@ -28,12 +28,7 @@ #include "SerialPort.hxx" #if defined(BSPF_UNIX) #include "SerialPortUNIX.hxx" - #if defined(RETRON77) - #include "SettingsR77.hxx" - #include "OSystemR77.hxx" - #else - #include "OSystemUNIX.hxx" - #endif + #include "OSystemUNIX.hxx" #elif defined(BSPF_WINDOWS) #include "SerialPortWINDOWS.hxx" #include "OSystemWINDOWS.hxx" @@ -83,11 +78,7 @@ class MediaFactory static unique_ptr createOSystem() { #if defined(BSPF_UNIX) - #if defined(RETRON77) - return make_unique(); - #else - return make_unique(); - #endif + return make_unique(); #elif defined(BSPF_WINDOWS) return make_unique(); #elif defined(BSPF_MACOS) @@ -101,11 +92,7 @@ class MediaFactory static unique_ptr createSettings() { - #ifdef RETRON77 - return make_unique(); - #else return make_unique(); - #endif } static unique_ptr createSerialPort() diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx index f527c94dd..2d829f923 100644 --- a/src/common/PJoystickHandler.cxx +++ b/src/common/PJoystickHandler.cxx @@ -405,18 +405,11 @@ void PhysicalJoystickHandler::setStickDefaultMapping( setDefaultAction(stick, item, event, EventMode::kDrivingMode, updateDefaults); } - #if defined(RETRON77) - constexpr bool retron77 = true; - #else - constexpr bool retron77 = false; - #endif - // Regular joysticks can only be used by one player at a time, // so we need to separate the paddles onto different - // devices. The R77 controllers support two players each when - // used as paddles, so are different. Similarly, stelladaptors - // and 2600-daptors support two players natively. - const int paddlesPerJoystick = (j->type == PhysicalJoystick::Type::REGULAR && !retron77) ? 1 : 2; + // devices. The Stelladaptor and 2600-daptor controllers support + // two players each when used as paddles, so are different. + const int paddlesPerJoystick = (j->type == PhysicalJoystick::Type::REGULAR) ? 1 : 2; if(paddlesPerJoystick == 2) { @@ -1355,17 +1348,11 @@ PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultRight // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultLeftPaddlesMapping = { {Event::LeftPaddleAAnalog, JOY_CTRL_NONE, JoyAxis::X, JoyDir::ANALOG}, -#if defined(RETRON77) - {Event::LeftPaddleAAnalog, JOY_CTRL_NONE, JoyAxis::Z, JoyDir::ANALOG}, -#endif // Current code does NOT allow digital and anlog events on the same axis at the same time //{Event::LeftPaddleADecrease, JOY_CTRL_NONE, JoyAxis::X, JoyDir::POS}, //{Event::LeftPaddleAIncrease, JOY_CTRL_NONE, JoyAxis::X, JoyDir::NEG}, {Event::LeftPaddleAFire, 0}, {Event::LeftPaddleBAnalog, JOY_CTRL_NONE, JoyAxis::Y, JoyDir::ANALOG}, -#if defined(RETRON77) - {Event::LeftPaddleBAnalog, JOY_CTRL_NONE, JoyAxis::A3, JoyDir::ANALOG}, -#endif // Current code does NOT allow digital and anlog events on the same axis at the same //{Event::LeftPaddleBDecrease, JOY_CTRL_NONE, JoyAxis::Y, JoyDir::POS}, //{Event::LeftPaddleBIncrease, JOY_CTRL_NONE, JoyAxis::Y, JoyDir::NEG}, @@ -1375,17 +1362,11 @@ PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultLeftP // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultRightPaddlesMapping = { {Event::RightPaddleAAnalog, JOY_CTRL_NONE, JoyAxis::X, JoyDir::ANALOG}, -#if defined(RETRON77) - {Event::RightPaddleAAnalog, JOY_CTRL_NONE, JoyAxis::Z, JoyDir::ANALOG}, -#endif // Current code does NOT allow digital and anlog events on the same axis at the same //{Event::RightPaddleADecrease, JOY_CTRL_NONE, JoyAxis::X, JoyDir::POS}, //{Event::RightPaddleAIncrease, JOY_CTRL_NONE, JoyAxis::X, JoyDir::NEG}, {Event::RightPaddleAFire, 0}, {Event::RightPaddleBAnalog, JOY_CTRL_NONE, JoyAxis::Y, JoyDir::ANALOG}, -#if defined(RETRON77) - {Event::RightPaddleBAnalog, JOY_CTRL_NONE, JoyAxis::A3, JoyDir::ANALOG}, -#endif // Current code does NOT allow digital and anlog events on the same axis at the same //{Event::RightPaddleBDecrease,JOY_CTRL_NONE, JoyAxis::Y, JoyDir::POS}, //{Event::RightPaddleBIncrease,JOY_CTRL_NONE, JoyAxis::Y, JoyDir::NEG}, @@ -1485,14 +1466,6 @@ PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultCommonMapping = { // valid for all joysticks // Note: buttons 0..2 are used by controllers! -#if defined(RETRON77) - {Event::CmdMenuMode, 3}, // Button "Y" / "4" - {Event::ExitMode, 4}, // Left Shoulder Button - {Event::OptionsMenuMode, 5}, // Right Shoulder Button - {Event::RewindPause, 7}, // Right Trigger Button - {Event::ConsoleSelect, 8}, // Button "Select" - {Event::ConsoleReset, 9}, // Button "Start" -#else {Event::ConsoleSelect, 8}, // Button "Select" {Event::ConsoleReset, 9}, // Button "Start" {Event::ConsoleColorToggle, 3}, // Button "Y" / "4" @@ -1500,7 +1473,6 @@ PhysicalJoystickHandler::DefaultCommonMapping = { {Event::ConsoleRightDiffToggle, 5}, // Right Shoulder Button {Event::CmdMenuMode, 6}, // Left Trigger Button {Event::OptionsMenuMode, 7}, // Right Trigger Button -#endif }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx index d637753fd..fd508b3b4 100644 --- a/src/common/PKeyboardHandler.cxx +++ b/src/common/PKeyboardHandler.cxx @@ -806,18 +806,10 @@ PhysicalKeyboardHandler::DefaultCommonMapping = { { Event::HighScoresMenuMode, KBDK_INSERT }, { Event::TogglePlayBackMode, KBDK_SPACE, KBDM_SHIFT }, - #if defined(RETRON77) - { Event::ConsoleColorToggle, KBDK_F4 }, // back ("COLOR","B/W") - { Event::ConsoleLeftDiffToggle, KBDK_F6 }, // front ("SKILL P1") - { Event::ConsoleRightDiffToggle, KBDK_F8 }, // front ("SKILL P2") - { Event::CmdMenuMode, KBDK_F13 }, // back ("4:3","16:9") - { Event::ExitMode, KBDK_BACKSPACE }, // back ("FRY") - #else // defining duplicate keys must be avoided! { Event::ConsoleBlackWhite, KBDK_F4 }, { Event::ConsoleLeftDiffB, KBDK_F6 }, { Event::ConsoleRightDiffB, KBDK_F8 }, - { Event::Fry, KBDK_BACKSPACE, KBDM_SHIFT }, -#endif + { Event::Fry, KBDK_BACKSPACE, KBDM_SHIFT } }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -862,24 +854,12 @@ PhysicalKeyboardHandler::DefaultMenuMapping = { {Event::Quit, KBDK_Q, KBDM_CTRL}, #endif -#if defined(RETRON77) - {Event::UIUp, KBDK_F9}, // front ("SAVE") - {Event::UIDown, KBDK_F2}, // front ("RESET") - {Event::UINavPrev, KBDK_F11}, // front ("LOAD") - {Event::UINavNext, KBDK_F1}, // front ("MODE") - {Event::UISelect, KBDK_F6}, // front ("SKILL P1") - {Event::UICancel, KBDK_F8}, // front ("SKILL P2") - //{Event::NoType, KBDK_F4}, // back ("COLOR","B/W") - {Event::UITabPrev, KBDK_F13}, // back ("4:3","16:9") - {Event::UITabNext, KBDK_BACKSPACE}, // back (FRY) -#else // defining duplicate keys must be avoided! {Event::UIPrevDir, KBDK_BACKSPACE}, #ifdef BSPF_MACOS {Event::UIHelp, KBDK_SLASH, KBDM_SHIFT | CMD}, #else {Event::UIHelp, KBDK_F1}, #endif -#endif }; #ifdef GUI_SUPPORT @@ -1157,9 +1137,7 @@ PhysicalKeyboardHandler::CompuMateMapping = { {Event::CompuMateRightBracket, KBDK_RIGHTBRACKET}, {Event::CompuMateMinus, KBDK_MINUS}, {Event::CompuMateQuote, KBDK_APOSTROPHE, KBDM_SHIFT}, -#ifndef RETRON77 {Event::CompuMateBackspace, KBDK_BACKSPACE}, -#endif {Event::CompuMateEquals, KBDK_EQUALS}, {Event::CompuMatePlus, KBDK_EQUALS, KBDM_SHIFT}, {Event::CompuMateSlash, KBDK_SLASH} diff --git a/src/emucore/EventHandlerConstants.hxx b/src/emucore/EventHandlerConstants.hxx index adf320276..ffc853e95 100644 --- a/src/emucore/EventHandlerConstants.hxx +++ b/src/emucore/EventHandlerConstants.hxx @@ -97,19 +97,11 @@ enum class EventMode: uInt8 { }; namespace GUI { -#ifdef RETRON77 - static const std::string SELECT = "Mode"; - static const std::string LEFT_DIFFICULTY = "P1 skill"; - static const std::string RIGHT_DIFFICULTY = "P2 skill"; - static const std::string LEFT_DIFF = "P1 Skill"; - static const std::string RIGHT_DIFF = "P2 Skill"; -#else static const std::string SELECT = "Select"; static const std::string LEFT_DIFFICULTY = "Left difficulty"; static const std::string RIGHT_DIFFICULTY = "Right difficulty"; static const std::string LEFT_DIFF = "Left Diff"; static const std::string RIGHT_DIFF = "Right Diff"; -#endif } // namespace GUI #endif // EVENTHANDLER_CONSTANTS_HXX diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx index 01e13fc99..81ffa383f 100644 --- a/src/emucore/TIASurface.cxx +++ b/src/emucore/TIASurface.cxx @@ -27,18 +27,9 @@ namespace { ScalingInterpolation interpolationModeFromSettings(const Settings& settings) { -#ifdef RETRON77 - // Witv TV / and or scanline interpolation, the image has a height of ~480px. THe R77 runs at 720p, so there - // is no benefit from QIS in y-direction. In addition, QIS on the R77 has performance issues if TV effects are - // enabled. - return settings.getBool("tia.inter") || settings.getInt("tv.filter") != 0 - ? ScalingInterpolation::blur - : ScalingInterpolation::sharp; -#else - return settings.getBool("tia.inter") ? - ScalingInterpolation::blur : - ScalingInterpolation::sharp; -#endif + return settings.getBool("tia.inter") + ? ScalingInterpolation::blur + : ScalingInterpolation::sharp; } } // namespace diff --git a/src/emucore/Thumbulator.hxx b/src/emucore/Thumbulator.hxx index b6f2c0bff..e8b6971b7 100644 --- a/src/emucore/Thumbulator.hxx +++ b/src/emucore/Thumbulator.hxx @@ -30,9 +30,7 @@ class Cartridge; #include "bspf.hxx" #include "Console.hxx" -#ifdef RETRON77 - #define UNSAFE_OPTIMIZATIONS -#endif +//#define UNSAFE_OPTIMIZATIONS #ifdef DEBUGGER_SUPPORT #define THUMB_CYCLE_COUNT diff --git a/src/gui/DeveloperDialog.cxx b/src/gui/DeveloperDialog.cxx index 14b67cfa3..53cdd598d 100644 --- a/src/gui/DeveloperDialog.cxx +++ b/src/gui/DeveloperDialog.cxx @@ -594,11 +594,7 @@ void DeveloperDialog::addTimeMachineTab(const GUI::Font& font) myStateSizeWidget = new SliderWidget(myTab, font, xpos, ypos - 1, swidth, lineHeight, "Buffer size (*) ", 0, kSizeChanged, lwidth, " states"); myStateSizeWidget->setMinValue(20); -#ifdef RETRON77 - myStateSizeWidget->setMaxValue(100); -#else myStateSizeWidget->setMaxValue(1000); -#endif myStateSizeWidget->setStepValue(20); myStateSizeWidget->setTickmarkIntervals(5); myStateSizeWidget->setToolTip("Define the total Time Machine buffer size."); @@ -608,11 +604,7 @@ void DeveloperDialog::addTimeMachineTab(const GUI::Font& font) myUncompressedWidget = new SliderWidget(myTab, font, xpos, ypos - 1, swidth, lineHeight, "Uncompressed size ", 0, kUncompressedChanged, lwidth, " states"); myUncompressedWidget->setMinValue(0); -#ifdef RETRON77 - myUncompressedWidget->setMaxValue(100); -#else myUncompressedWidget->setMaxValue(1000); -#endif myUncompressedWidget->setStepValue(20); myUncompressedWidget->setTickmarkIntervals(5); myUncompressedWidget->setToolTip("Define the number of completely kept states.\n" diff --git a/src/gui/Dialog.cxx b/src/gui/Dialog.cxx index f7a806aad..149bdc94d 100644 --- a/src/gui/Dialog.cxx +++ b/src/gui/Dialog.cxx @@ -159,7 +159,6 @@ void Dialog::setTitle(string_view title) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Dialog::initHelp() { -#ifndef RETRON77 if(hasTitle()) { if(_helpWidget == nullptr) @@ -181,7 +180,6 @@ void Dialog::initHelp() else _helpWidget->setFlags(Widget::FLAG_INVISIBLE); } -#endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -624,15 +622,6 @@ void Dialog::handleKeyDown(StellaKey key, StellaMod mod, bool repeated) tooltip().hide(); -// FIXME - I don't think this will compile! -#if defined(RETRON77) - // special keys used for R77 - if (key == KBDK_F13) - e = Event::UITabPrev; - else if (key == KBDK_BACKSPACE) - e = Event::UITabNext; -#endif - // Check the keytable now, since we might get one of the above events, // which must always be processed before any widget sees it. if(e == Event::NoType) @@ -756,10 +745,8 @@ void Dialog::handleMouseMoved(int x, int y) if (w && (w->getFlags() & Widget::FLAG_TRACK_MOUSE)) w->handleMouseMoved(x - (w->getAbsX() - _x), y - (w->getAbsY() - _y)); -#ifndef RETRON77 // Update mouse coordinates for tooltips _toolTip->update(_mouseWidget, Common::Point(x, y)); -#endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index 1a826160b..752a4de41 100644 --- a/src/gui/InputDialog.cxx +++ b/src/gui/InputDialog.cxx @@ -564,13 +564,8 @@ void InputDialog::setDefaults() // Paddle linearity myPaddleLinearity->setValue(100); - #if defined(RETRON77) - myDejitterBase->setValue(2); - myDejitterDiff->setValue(6); - #else myDejitterBase->setValue(0); myDejitterDiff->setValue(0); - #endif // Paddle speed (digital) myDPaddleSpeed->setValue(10); diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index 7a6137b50..30da6ae01 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -102,9 +102,6 @@ void LauncherDialog::addTitleWidget(int &ypos) // App information ostringstream ver; ver << "Stella " << STELLA_VERSION; -#if defined(RETRON77) - ver << " for RetroN 77"; -#endif new StaticTextWidget(this, _font, 1, ypos, _w - 2, fontHeight, ver.view(), TextAlign::Center); ypos += fontHeight + VGAP; @@ -859,36 +856,9 @@ void LauncherDialog::handleKeyDown(StellaKey key, StellaMod mod, bool repeated) } } if(!handled) -#if defined(RETRON77) - // handle keys used by R77 - switch(key) - { - case KBDK_F8: // front ("Skill P2") - openGlobalProps(); - break; - case KBDK_F4: // back ("COLOR", "B/W") - openSettings(); - break; - - case KBDK_F11: // front ("LOAD") - // convert unused previous item key into page-up event - _focusedWidget->handleEvent(Event::UIPgUp); - break; - - case KBDK_F1: // front ("MODE") - // convert unused next item key into page-down event - _focusedWidget->handleEvent(Event::UIPgDown); - break; - - default: - Dialog::handleKeyDown(key, mod); - break; - } -#else // Required because BrowserDialog does not want raw input if(repeated || !myList->handleKeyDown(key, mod)) Dialog::handleKeyDown(key, mod, repeated); -#endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1203,19 +1173,13 @@ void LauncherDialog::openContextMenu(int x, int y) } if(myUseMinimalUI) { - #ifndef RETRON77 items.emplace_back(instance().settings().getBool("launchersubdirs") ? "Exclude subdirectories" : "Include subdirectories", "subdirs"); - #endif items.emplace_back("Go to initial directory", "homedir"); items.emplace_back("Go to parent directory", "prevdir"); - #ifndef RETRON77 items.emplace_back("Reload listing", "reload"); items.emplace_back("Options" + ELLIPSIS, "options"); - #else - items.emplace_back("Settings" + ELLIPSIS, "options"); - #endif } else { diff --git a/src/gui/R77HelpDialog.cxx b/src/gui/R77HelpDialog.cxx deleted file mode 100644 index e01348a70..000000000 --- a/src/gui/R77HelpDialog.cxx +++ /dev/null @@ -1,278 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2025 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#include "bspf.hxx" -#include "Dialog.hxx" -#include "Widget.hxx" -#include "Font.hxx" - -#include "R77HelpDialog.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R77HelpDialog::R77HelpDialog(OSystem& osystem, DialogContainer& parent, - const GUI::Font& font) - : Dialog(osystem, parent, font, "RetroN 77 help") -{ - const int lineHeight = Dialog::lineHeight(), - fontHeight = Dialog::fontHeight(), - fontWidth = Dialog::fontWidth(), - buttonHeight = Dialog::buttonHeight(), - buttonWidth = Dialog::buttonWidth("Previous"), - BUTTON_GAP = Dialog::buttonGap(), - VBORDER = Dialog::vBorder(), - HBORDER = Dialog::hBorder(); - WidgetArray wid; - - // Set real dimensions - _w = 47 * fontWidth + HBORDER * 2; - _h = (LINES_PER_PAGE + 2) * lineHeight + VBORDER * 2 + _th; - - // Add Previous, Next and Close buttons - int xpos = HBORDER, ypos = _h - buttonHeight - VBORDER; - myPrevButton = - new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Previous", GuiObject::kPrevCmd); - myPrevButton->clearFlags(Widget::FLAG_ENABLED); - wid.push_back(myPrevButton); - - xpos += buttonWidth + BUTTON_GAP; - myNextButton = - new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Next", GuiObject::kNextCmd); - wid.push_back(myNextButton); - - xpos = _w - buttonWidth - HBORDER; - auto* b = new ButtonWidget(this, font, xpos, ypos, - buttonWidth, buttonHeight, - "Close", GuiObject::kCloseCmd); - wid.push_back(b); - addCancelWidget(b); - - xpos = HBORDER; ypos = VBORDER + _th; - myTitle = new StaticTextWidget(this, font, xpos, ypos, _w - HBORDER * 2, fontHeight, - "", TextAlign::Center); - - const int jwidth = 11 * fontWidth, bwidth = jwidth; - xpos = HBORDER; ypos += lineHeight + 4; - for (uInt8 i = 0; i < LINES_PER_PAGE; ++i) - { - myJoy[i] = - new StaticTextWidget(this, font, xpos, ypos, jwidth, - fontHeight, "", TextAlign::Left); - myBtn[i] = - new StaticTextWidget(this, font, xpos + jwidth, ypos, bwidth, - fontHeight, "", TextAlign::Left); - myDesc[i] = - new StaticTextWidget(this, font, xpos + jwidth + bwidth, ypos, _w - jwidth - bwidth - HBORDER * 2, - fontHeight, "", TextAlign::Left); - ypos += fontHeight; - } - - addToFocusList(wid); -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void R77HelpDialog::loadConfig() -{ - displayInfo(); - setFocus(getFocusList()[1]); // skip initially disabled 'Previous' button -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void R77HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) -{ - int i = 0; - auto ADD_BIND = [&](const string & j = "", const string & b = "", const string & d = "") - { - myJoyStr[i] = j; myBtnStr[i] = b; myDescStr[i] = d; i++; - }; - const auto ADD_TEXT = [&](const string & d) { ADD_BIND("", d.substr(0, 11), d.substr(11, 40)); }; - const auto ADD_LINE = [&]() { ADD_BIND("-----------", "-----------", "------------------------"); }; - - switch (page) - { - case 1: - title = "\\C\\c5Emulation commands"; - ADD_BIND("The joystic", "ks work nor", "mal and all console"); - ADD_BIND("buttons as ", "labeled exc", "ept of the following:"); - ADD_BIND(); - ADD_BIND("Joystick", "Console", "Command"); - ADD_LINE(); - ADD_BIND("\\c2Button 4", "4:3,16:9", "Open command dialog"); - ADD_BIND("\\c2Button 5", "FRY", "Return to launcher"); - ADD_BIND("\\c2Button 6", "\\c2-", "Open settings"); - ADD_BIND("\\c2Button 7", "\\c2-", "Rewind game"); - ADD_BIND("\\c2Button 8", "MODE", "Select"); - ADD_BIND("\\c2Button 9", "RESET", "Reset"); - break; - - case 2: - title = "\\C\\c5Launcher commands"; - ADD_BIND("Joystick", "Console", "Command"); - ADD_LINE(); - ADD_BIND("Up", "SAVE", "Previous game"); - ADD_BIND("Down", "RESET", "Next game"); - ADD_BIND("Left", "LOAD", "Page up"); - ADD_BIND("Right", "MODE", "Page down"); - ADD_BIND("Button 1", "SKILL P1", "Start selected game"); - ADD_BIND("\\c2Button 2", "SKILL P2", "Open power-on options"); - ADD_BIND(" or hold Bu", "tton 1", ""); - ADD_BIND("\\c2Button 4", "Color,B/W", "Open settings"); - break; - - case 3: - title = "\\C\\c5Dialog commands"; - ADD_BIND("Joystick", "Button", "Command"); - ADD_LINE(); - ADD_BIND("Up", "SAVE", "Increase current setting"); - ADD_BIND("Down", "RESET", "Decrease current setting"); - ADD_BIND("Left", "LOAD", "Previous dialog element"); - ADD_BIND("Right", "MODE", "Next dialog element"); - ADD_BIND("Button 1", "SKILL P1", "Select element"); - ADD_BIND("\\c2Button 2", "SKILL P2", "OK"); - ADD_BIND("\\c2Button 3", "4:3,16:9", "Previous tab"); - ADD_BIND(" or Button ", "1+Left", ""); - ADD_BIND("\\c2Button 4", "FRY", "Next tab"); - ADD_BIND(" or Button ", "1+Right", ""); - ADD_BIND("\\c2Button 6", "\\c2-", "Cancel"); - break; - - case 4: - title = "\\C\\c5All commands"; - ADD_BIND(); - ADD_BIND("Remapped Ev", "ents", ""); - ADD_BIND(); - ADD_TEXT("Most commands can be remapped."); - ADD_BIND(); - ADD_TEXT("Please use 'Advanced Settings'"); - ADD_TEXT("and consult the 'Options/Input" + ELLIPSIS + "'"); - ADD_TEXT("dialog for more information."); - break; - - default: - return; - } - - while (i < lines) // NOLINT : i changes in lambda above - ADD_BIND(); -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void R77HelpDialog::displayInfo() -{ - string titleStr; - updateStrings(myPage, LINES_PER_PAGE, titleStr); - - formatWidget(titleStr, myTitle); - for (uInt8 i = 0; i < LINES_PER_PAGE; ++i) - { - formatWidget(myJoyStr[i], myJoy[i]); - formatWidget(myBtnStr[i], myBtn[i]); - formatWidget(myDescStr[i], myDesc[i]); - } -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void R77HelpDialog::formatWidget(const string& label, StaticTextWidget* widget) -{ - const char* str = label.c_str(); - TextAlign align = TextAlign::Left; - ColorId color = kTextColor; - - while (str[0] == '\\') - { - switch (str[1]) - { - case 'C': - align = TextAlign::Center; - break; - - case 'L': - align = TextAlign::Left; - break; - - case 'R': - align = TextAlign::Right; - break; - - case 'c': - switch (str[2]) - { - case '0': - color = kTextColor; - break; - case '1': - color = kTextColorHi; - break; - case '2': - color = kColor; - break; - case '3': - color = kShadowColor; - break; - case '4': - color = kBGColor; - break; - case '5': - color = kTextColorEm; - break; - default: - break; - } - str++; - break; - - default: - break; - } - str += 2; - } - widget->setAlign(align); - widget->setTextColor(color); - widget->setLabel(str); -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void R77HelpDialog::handleCommand(CommandSender * sender, int cmd, - int data, int id) -{ - switch (cmd) - { - case GuiObject::kNextCmd: - ++myPage; - if (myPage >= myNumPages) - myNextButton->clearFlags(Widget::FLAG_ENABLED); - if (myPage >= 2) - myPrevButton->setFlags(Widget::FLAG_ENABLED); - - displayInfo(); - break; - - case GuiObject::kPrevCmd: - --myPage; - if (myPage <= myNumPages) - myNextButton->setFlags(Widget::FLAG_ENABLED); - if (myPage <= 1) - myPrevButton->clearFlags(Widget::FLAG_ENABLED); - - displayInfo(); - break; - - default: - Dialog::handleCommand(sender, cmd, data, 0); - } -} diff --git a/src/gui/R77HelpDialog.hxx b/src/gui/R77HelpDialog.hxx deleted file mode 100644 index 40e0001ab..000000000 --- a/src/gui/R77HelpDialog.hxx +++ /dev/null @@ -1,68 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2025 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#ifndef MIN_UI_HELP_DIALOG_HXX -#define MIN_UI_HELP_DIALOG_HXX - -class DialogContainer; -class CommandSender; -class ButtonWidget; -class StaticTextWidget; -class OSystem; - -#include "Dialog.hxx" -#include "bspf.hxx" - -class R77HelpDialog : public Dialog -{ - public: - R77HelpDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); - ~R77HelpDialog() override = default; - - private: - void handleCommand(CommandSender* sender, int cmd, int data, int id) override; - void updateStrings(uInt8 page, uInt8 lines, string& title); - void displayInfo(); - static void formatWidget(const string& label, StaticTextWidget* widget); - void loadConfig() override; - - private: - static constexpr uInt32 LINES_PER_PAGE = 13; - ButtonWidget* myNextButton{nullptr}; - ButtonWidget* myPrevButton{nullptr}; - - StaticTextWidget* myTitle{nullptr}; - std::array myJoy{nullptr}; - std::array myBtn{nullptr}; - std::array myDesc{nullptr}; - std::array myJoyStr; - std::array myBtnStr; - std::array myDescStr; - - uInt8 myPage{1}; - uInt8 myNumPages{4}; - - private: - // Following constructors and assignment operators not supported - R77HelpDialog() = delete; - R77HelpDialog(const R77HelpDialog&) = delete; - R77HelpDialog(R77HelpDialog&&) = delete; - R77HelpDialog& operator=(const R77HelpDialog&) = delete; - R77HelpDialog& operator=(R77HelpDialog&&) = delete; -}; - -#endif diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx index 80b3f9bc2..bb5651b46 100644 --- a/src/gui/StellaSettingsDialog.cxx +++ b/src/gui/StellaSettingsDialog.cxx @@ -507,11 +507,7 @@ void StellaSettingsDialog::openHelp() { // Create an help dialog, similar to the in-game one if (myHelpDialog == nullptr) - #if defined(RETRON77) - myHelpDialog = make_unique(instance(), parent(), _font); - #else myHelpDialog = make_unique(instance(), parent(), _font); - #endif myHelpDialog->open(); } diff --git a/src/gui/StellaSettingsDialog.hxx b/src/gui/StellaSettingsDialog.hxx index 127310f43..58fa38316 100644 --- a/src/gui/StellaSettingsDialog.hxx +++ b/src/gui/StellaSettingsDialog.hxx @@ -24,11 +24,7 @@ class PopUpWidget; #include "OptionsMenu.hxx" #include "Dialog.hxx" -#if defined(RETRON77) - #include "R77HelpDialog.hxx" -#else - #include "HelpDialog.hxx" -#endif +#include "HelpDialog.hxx" namespace GUI { class Font; @@ -96,11 +92,7 @@ class StellaSettingsDialog : public Dialog StaticTextWidget* myRightPortDetected{nullptr}; unique_ptr myConfirmMsg; - #if defined(RETRON77) - unique_ptr myHelpDialog; - #else unique_ptr myHelpDialog; - #endif // Indicates if this dialog is used for global (vs. in-game) settings AppMode myMode{AppMode::emulator}; diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx index 83da84a8e..f093cf1ff 100644 --- a/src/gui/WhatsNewDialog.cxx +++ b/src/gui/WhatsNewDialog.cxx @@ -26,13 +26,8 @@ static constexpr int MAX_CHARS = 64; // maximum number of chars per line // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, int max_w, int max_h) -#if defined(RETRON77) - : Dialog(osystem, parent, osystem.frameBuffer().font(), - "What's New in Stella " + string(STELLA_VERSION) + " for RetroN 77?") -#else : Dialog(osystem, parent, osystem.frameBuffer().font(), "What's New in Stella " + string(STELLA_VERSION) + "?") -#endif { const int fontWidth = Dialog::fontWidth(), buttonHeight = Dialog::buttonHeight(), @@ -46,18 +41,6 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, max_w, max_h); const string_view version = instance().settings().getString("stella.version"); -#ifdef RETRON77 - add(ypos, "extensively redesigned and enhanced file launcher"); - add(ypos, "improved controller mappings for Paddles"); - add(ypos, "improved controller mappings for Driving controllers"); - add(ypos, "added keeping multiple dump files when dumping to SD"); - add(ypos, "removed deadzone from USB game controllers"); - add(ypos, "added opt-out for overclocking to the settings file"); - add(ypos, "enhanced ROM launcher to allow multiple images per ROM"); - add(ypos, "made heaps of additional images and bezels available for download"); - add(ypos, "added bezel support (incl. Sinden Lightgun)"); - add(ypos, "accelerated ARM emulation by ~15%"); -#else if(version < "7.0") { add(ypos, "accelerated ARM emulation by ~15%"); @@ -65,7 +48,6 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, } add(ypos, "ported Stella to SDL3"); add(ypos, ELLIPSIS + " (for a complete list see 'docs/Changes.txt')"); -#endif // Set needed dimensions ypos += VGAP * 2 + buttonHeight + VBORDER; diff --git a/src/gui/Widget.cxx b/src/gui/Widget.cxx index 74ffe17f7..cb92ef640 100644 --- a/src/gui/Widget.cxx +++ b/src/gui/Widget.cxx @@ -75,10 +75,8 @@ void Widget::tick() { if(isEnabled()) { - #ifndef RETRON77 if(wantsToolTip()) dialog().tooltip().request(); - #endif // Recursively tick widget and all child dialogs and widgets Widget* w = _firstWidget; @@ -588,7 +586,6 @@ void StaticTextWidget::setLink(size_t start, int len, bool underline) bool StaticTextWidget::setUrl(string_view url, string_view label, string_view placeHolder) { -#ifndef RETRON77 size_t start = string::npos, len = 0; const string_view text = label != EmptyString ? label : url; @@ -649,9 +646,6 @@ bool StaticTextWidget::setUrl(string_view url, string_view label, _url = EmptyString; return false; } -#else - return false; -#endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/module.mk b/src/gui/module.mk index 91c48d171..3aec9e56b 100644 --- a/src/gui/module.mk +++ b/src/gui/module.mk @@ -44,7 +44,6 @@ MODULE_OBJS := \ src/gui/PopUpWidget.o \ src/gui/ProgressDialog.o \ src/gui/QuadTariDialog.o \ - src/gui/R77HelpDialog.o \ src/gui/RadioButtonWidget.o \ src/gui/RomAuditDialog.o \ src/gui/RomImageWidget.o \ diff --git a/src/os/unix/FSNodePOSIX.cxx b/src/os/unix/FSNodePOSIX.cxx index 605514272..00c3d7111 100644 --- a/src/os/unix/FSNodePOSIX.cxx +++ b/src/os/unix/FSNodePOSIX.cxx @@ -15,17 +15,11 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#if defined(RETRON77) - #define ROOT_DIR "/mnt/games/" -#else - #define ROOT_DIR "/" -#endif - #include "FSNodePOSIX.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FSNodePOSIX::FSNodePOSIX() - : _path{ROOT_DIR}, + : _path{"/"}, _displayName{_path} { } @@ -111,13 +105,13 @@ size_t FSNodePOSIX::getSize() const // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool FSNodePOSIX::hasParent() const { - return !_path.empty() && _path != ROOT_DIR; + return !_path.empty() && _path != "/"; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AbstractFSNodePtr FSNodePOSIX::getParent() const { - if (_path == ROOT_DIR) + if (_path == "/") return nullptr; return make_unique(stemPathComponent(_path)); diff --git a/src/os/unix/r77/OSystemR77.cxx b/src/os/unix/r77/OSystemR77.cxx deleted file mode 100644 index 4303425ff..000000000 --- a/src/os/unix/r77/OSystemR77.cxx +++ /dev/null @@ -1,25 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2025 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#include "OSystemR77.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void OSystemR77::getBaseDirectories(string& basedir, string& homeDir, - bool, const string&) -{ - basedir = homeDir = "/mnt/stella/"; -} diff --git a/src/os/unix/r77/OSystemR77.hxx b/src/os/unix/r77/OSystemR77.hxx deleted file mode 100644 index 5d7de1340..000000000 --- a/src/os/unix/r77/OSystemR77.hxx +++ /dev/null @@ -1,62 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2025 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#ifndef OSYSTEM_R77_HXX -#define OSYSTEM_R77_HXX - -#include "OSystemStandalone.hxx" - -/** - This class defines an OSystem object for the Retron77 system. - The Retron77 system is based on an embedded Linux platform. - - It is responsible for completely implementing getBaseDirectories(), - to set the base directory and various other save/load locations. - - @author Stephen Anthony -*/ -class OSystemR77 : public OSystemStandalone -{ - public: - OSystemR77() = default; - ~OSystemR77() override = default; - - /** - Determine the base directory and home directory from the derived - class. It can also use hints, as described below. - - @param basedir The base directory for all configuration files - @param homedir The default directory to store various other files - @param useappdir A hint that the base dir should be set to the - app directory; not all ports can do this, so - they are free to ignore it - @param usedir A hint that the base dir should be set to this - parameter; not all ports can do this, so - they are free to ignore it - */ - void getBaseDirectories(string& basedir, string& homedir, - bool useappdir, string_view usedir) override; - - private: - // Following constructors and assignment operators not supported - OSystemR77(const OSystemR77&) = delete; - OSystemR77(OSystemR77&&) = delete; - OSystemR77& operator=(const OSystemR77&) = delete; - OSystemR77& operator=(OSystemR77&&) = delete; -}; - -#endif diff --git a/src/os/unix/r77/SettingsR77.cxx b/src/os/unix/r77/SettingsR77.cxx deleted file mode 100644 index 02747a2be..000000000 --- a/src/os/unix/r77/SettingsR77.cxx +++ /dev/null @@ -1,86 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2025 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#include - -#include "SettingsR77.hxx" - -/** - The Retron77 system is a locked-down, set piece of hardware. - No configuration of Stella is possible, since the UI isn't exposed. - So we hardcode the specific settings here. -*/ - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SettingsR77::SettingsR77() - : Settings() -{ - setPermanent("video", "opengles2"); - setPermanent("vsync", "true"); - - setPermanent("tia.zoom", "3"); - setPermanent("tia.fs_stretch", "false"); // start in 4:3 by default - - setPermanent("audio.buffer_size", "6"); - setPermanent("audio.enabled", "1"); - setPermanent("audio.fragment_size", "512"); - setPermanent("audio.headroom", "5"); - setPermanent("audio.preset", "1"); - setPermanent("audio.resampling_quality", "2"); - setPermanent("audio.sample_rate", "48000"); - setPermanent("audio.stereo", "0"); - setPermanent("audio.volume", "100"); - - setPermanent("romdir", "/mnt/games"); - setPermanent("snapsavedir", "/mnt/stella/snapshots"); - setPermanent("snaploaddir", "/mnt/stella/snapshots"); - - setPermanent("launcherres", "1280x720"); - setPermanent("launcherfont", "large12"); - setPermanent("romviewer", "1.6"); - setPermanent("exitlauncher", "true"); - - setTemporary("minimal_ui", true); - setPermanent("basic_settings", true); - - setPermanent("dev.settings", false); - // record states for 60 seconds - setPermanent("plr.timemachine", true); - setPermanent("plr.tm.size", 60); - setPermanent("plr.tm.uncompressed", 60); - setPermanent("plr.tm.interval", "1s"); - - setPermanent("threads", "1"); - - // all TV effects off by default (aligned to StellaSettingsDialog defaults!) - setPermanent("tv.filter", "1"); // RGB - setPermanent("tv.phosphor", "always"); - setPermanent("tv.phosblend", "45"); // level 6 - setPermanent("tv.scanlines", "18"); // level 3 - - // enable dejitter by default - setPermanent("dejitter.base", "2"); - setPermanent("dejitter.diff", "6"); - - /* - setPermanent("joymap", - string() + - "128^i2c_controller|4 17 18 15 16 31 31 35 35 121 122 112 113 0 0 0 0|8 19 20 100 99 103 0 0 0 120 123 127 126 0 124 0 0|" + - "0^i2c_controller #2|4 24 25 22 23 39 39 43 43 121 122 112 113 0 0 0 0|8 26 27 100 99 103 110 0 0 120 123 127 126 0 124 0 0|0" - ); - */ -} diff --git a/src/os/unix/r77/SettingsR77.hxx b/src/os/unix/r77/SettingsR77.hxx deleted file mode 100644 index 9a4998285..000000000 --- a/src/os/unix/r77/SettingsR77.hxx +++ /dev/null @@ -1,46 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2025 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -//============================================================================ - -#ifndef SETTINGS_R77_HXX -#define SETTINGS_R77_HXX - -#include "Settings.hxx" - -/** - This class is used for the Retron77 system specific settings. - The Retron77 system is based on an embedded Linux platform. - - @author Stephen Anthony -*/ -class SettingsR77 : public Settings -{ - public: - /** - Create a new UNIX settings object - */ - explicit SettingsR77(); - ~SettingsR77() override = default; - - private: - // Following constructors and assignment operators not supported - SettingsR77(const SettingsR77&) = delete; - SettingsR77(SettingsR77&&) = delete; - SettingsR77& operator=(const SettingsR77&) = delete; - SettingsR77& operator=(SettingsR77&&) = delete; -}; - -#endif diff --git a/src/os/unix/r77/module.mk b/src/os/unix/r77/module.mk deleted file mode 100644 index 5c6763cc7..000000000 --- a/src/os/unix/r77/module.mk +++ /dev/null @@ -1,13 +0,0 @@ -MODULE := src/os/unix/r77 - -MODULE_OBJS := \ - src/os/unix/r77/OSystemR77.o \ - src/os/unix/r77/SettingsR77.o - -MODULE_TEST_OBJS = - -MODULE_DIRS += \ - src/os/unix/r77 - -# Include common rules -include $(srcdir)/common.rules diff --git a/src/os/windows/Stella.vcxproj b/src/os/windows/Stella.vcxproj index aa8506b1a..d89fff63c 100755 --- a/src/os/windows/Stella.vcxproj +++ b/src/os/windows/Stella.vcxproj @@ -760,7 +760,6 @@ - @@ -1757,7 +1756,6 @@ - diff --git a/src/os/windows/Stella.vcxproj.filters b/src/os/windows/Stella.vcxproj.filters index a49913e5d..b0ad56510 100644 --- a/src/os/windows/Stella.vcxproj.filters +++ b/src/os/windows/Stella.vcxproj.filters @@ -705,9 +705,6 @@ Source Files\gui - - Source Files\gui - Source Files\debugger @@ -1901,9 +1898,6 @@ Header Files\common\repository - - Header Files\gui - Header Files\debugger