diff --git a/src/common/MediaFactory.hxx b/src/common/MediaFactory.hxx index 4d205b59b..88ef4ed80 100644 --- a/src/common/MediaFactory.hxx +++ b/src/common/MediaFactory.hxx @@ -32,22 +32,18 @@ #include "SettingsR77.hxx" #include "OSystemR77.hxx" #else - #include "SettingsUNIX.hxx" #include "OSystemUNIX.hxx" #endif #elif defined(BSPF_WINDOWS) #include "SerialPortWINDOWS.hxx" - #include "SettingsWINDOWS.hxx" #include "OSystemWINDOWS.hxx" #elif defined(BSPF_MACOS) #include "SerialPortMACOS.hxx" - #include "SettingsMACOS.hxx" #include "OSystemMACOS.hxx" extern "C" { int stellaMain(int argc, char* argv[]); } #elif defined(__LIB_RETRO__) - #include "SettingsLIBRETRO.hxx" #include "OSystemLIBRETRO.hxx" #else #error Unsupported platform! @@ -112,20 +108,10 @@ class MediaFactory static unique_ptr createSettings() { - #if defined(BSPF_UNIX) - #if defined(RETRON77) - return make_unique(); - #else - return make_unique(); - #endif - #elif defined(BSPF_WINDOWS) - return make_unique(); - #elif defined(BSPF_MACOS) - return make_unique(); - #elif defined(__LIB_RETRO__) - return make_unique(); + #ifdef RETRON77 + return make_unique(); #else - #error Unsupported platform for Settings! + return make_unique(); #endif } diff --git a/src/libretro/Makefile.common b/src/libretro/Makefile.common index f8079f9ea..60e1b9d52 100644 --- a/src/libretro/Makefile.common +++ b/src/libretro/Makefile.common @@ -12,7 +12,6 @@ SOURCES_CXX := \ $(CORE_DIR)/libretro/FBSurfaceLIBRETRO.cxx \ $(CORE_DIR)/libretro/FrameBufferLIBRETRO.cxx \ $(CORE_DIR)/libretro/OSystemLIBRETRO.cxx \ - $(CORE_DIR)/libretro/SettingsLIBRETRO.cxx \ $(CORE_DIR)/libretro/SoundLIBRETRO.cxx \ $(CORE_DIR)/libretro/StellaLIBRETRO.cxx \ $(CORE_DIR)/common/AudioQueue.cxx \ diff --git a/src/libretro/SettingsLIBRETRO.cxx b/src/libretro/SettingsLIBRETRO.cxx deleted file mode 100644 index 73122d51c..000000000 --- a/src/libretro/SettingsLIBRETRO.cxx +++ /dev/null @@ -1,24 +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-2019 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 "SettingsLIBRETRO.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SettingsLIBRETRO::SettingsLIBRETRO() - : Settings() -{ -} diff --git a/src/libretro/SettingsLIBRETRO.hxx b/src/libretro/SettingsLIBRETRO.hxx deleted file mode 100644 index 5e6bdc156..000000000 --- a/src/libretro/SettingsLIBRETRO.hxx +++ /dev/null @@ -1,42 +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-2019 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_LIBRETRO_HXX -#define SETTINGS_LIBRETRO_HXX - -class OSystem; - -#include "Settings.hxx" - -class SettingsLIBRETRO : public Settings -{ - public: - /** - Create a new LIBRETRO settings object - */ - explicit SettingsLIBRETRO(); - virtual ~SettingsLIBRETRO() = default; - - private: - // Following constructors and assignment operators not supported - SettingsLIBRETRO(const SettingsLIBRETRO&) = delete; - SettingsLIBRETRO(SettingsLIBRETRO&&) = delete; - SettingsLIBRETRO& operator=(const SettingsLIBRETRO&) = delete; - SettingsLIBRETRO& operator=(SettingsLIBRETRO&&) = delete; -}; - -#endif diff --git a/src/macos/SettingsMACOS.cxx b/src/macos/SettingsMACOS.cxx deleted file mode 100644 index 418aab7e8..000000000 --- a/src/macos/SettingsMACOS.cxx +++ /dev/null @@ -1,24 +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-2019 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 "SettingsMACOS.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SettingsMACOS::SettingsMACOS() - : Settings() -{ -} diff --git a/src/macos/SettingsMACOS.hxx b/src/macos/SettingsMACOS.hxx deleted file mode 100644 index 4bdeef803..000000000 --- a/src/macos/SettingsMACOS.hxx +++ /dev/null @@ -1,45 +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-2019 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_MACOS_HXX -#define SETTINGS_MACOS_HXX - -#include "Settings.hxx" - -/** - This class defines macOS system-specific settings. - - @author Mark Grebe, Stephen Anthony -*/ -class SettingsMACOS : public Settings -{ - public: - /** - Create a new UNIX settings object - */ - explicit SettingsMACOS(); - virtual ~SettingsMACOS() = default; - - private: - // Following constructors and assignment operators not supported - SettingsMACOS(const SettingsMACOS&) = delete; - SettingsMACOS(SettingsMACOS&&) = delete; - SettingsMACOS& operator=(const SettingsMACOS&) = delete; - SettingsMACOS& operator=(SettingsMACOS&&) = delete; -}; - -#endif diff --git a/src/macos/stella.xcodeproj/project.pbxproj b/src/macos/stella.xcodeproj/project.pbxproj index 58c72cbc4..7da168caa 100644 --- a/src/macos/stella.xcodeproj/project.pbxproj +++ b/src/macos/stella.xcodeproj/project.pbxproj @@ -649,8 +649,6 @@ E06508C12272447200B341AC /* KeyValueRepositoryConfigfile.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E06508BB2272447200B341AC /* KeyValueRepositoryConfigfile.cxx */; }; E06508CA2272493200B341AC /* SettingsRepositoryMACOS.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508C82272493200B341AC /* SettingsRepositoryMACOS.hxx */; }; E06508CB2272493200B341AC /* SettingsRepositoryMACOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E06508C92272493200B341AC /* SettingsRepositoryMACOS.mm */; }; - E06508D22272671600B341AC /* SettingsMACOS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E06508D02272671600B341AC /* SettingsMACOS.cxx */; }; - E06508D32272671600B341AC /* SettingsMACOS.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508D12272671600B341AC /* SettingsMACOS.hxx */; }; E0893AF2211B9842008B170D /* HighPass.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0893AF0211B9841008B170D /* HighPass.cxx */; }; E0893AF3211B9842008B170D /* HighPass.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E0893AF1211B9841008B170D /* HighPass.hxx */; }; E09F413B201E901D004A3391 /* AudioQueue.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E09F4139201E901C004A3391 /* AudioQueue.hxx */; }; @@ -1363,8 +1361,6 @@ E06508BB2272447200B341AC /* KeyValueRepositoryConfigfile.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyValueRepositoryConfigfile.cxx; sourceTree = ""; }; E06508C82272493200B341AC /* SettingsRepositoryMACOS.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = SettingsRepositoryMACOS.hxx; sourceTree = ""; }; E06508C92272493200B341AC /* SettingsRepositoryMACOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsRepositoryMACOS.mm; sourceTree = ""; }; - E06508D02272671600B341AC /* SettingsMACOS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsMACOS.cxx; sourceTree = ""; }; - E06508D12272671600B341AC /* SettingsMACOS.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SettingsMACOS.hxx; sourceTree = ""; }; E07C2326226393BD00B78631 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; E0893AF0211B9841008B170D /* HighPass.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HighPass.cxx; path = audio/HighPass.cxx; sourceTree = ""; }; E0893AF1211B9841008B170D /* HighPass.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = HighPass.hxx; path = audio/HighPass.hxx; sourceTree = ""; }; @@ -1726,8 +1722,6 @@ 2D6050C60898771C00C6DE89 /* macos */ = { isa = PBXGroup; children = ( - E06508D02272671600B341AC /* SettingsMACOS.cxx */, - E06508D12272671600B341AC /* SettingsMACOS.hxx */, DC21E5B921CA903E007D0E1A /* OSystemMACOS.cxx */, DC21E5BA21CA903E007D0E1A /* OSystemMACOS.hxx */, DC21E5BB21CA903E007D0E1A /* SerialPortMACOS.cxx */, @@ -2407,7 +2401,6 @@ DCE5CDE41BA10024005CD08A /* RiotRamWidget.hxx in Headers */, DCF3A6E81DFC75E3008A8AF3 /* Background.hxx in Headers */, DC21E5C021CA903E007D0E1A /* OSystemMACOS.hxx in Headers */, - E06508D32272671600B341AC /* SettingsMACOS.hxx in Headers */, DCFB9FAC1ECA2609004FD69B /* DelayQueueIteratorImpl.hxx in Headers */, DCA078351F8C1B04008EFEE5 /* SDL_lib.hxx in Headers */, DCDA03B11A2009BB00711920 /* CartWD.hxx in Headers */, @@ -3016,7 +3009,6 @@ DC368F5818A2FB710084199C /* SoundSDL2.cxx in Sources */, DCFF14CD18B0260300A20364 /* EventHandlerSDL2.cxx in Sources */, DC3EE8561E2C0E6D00905161 /* adler32.c in Sources */, - E06508D22272671600B341AC /* SettingsMACOS.cxx in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/unix/SettingsUNIX.cxx b/src/unix/SettingsUNIX.cxx deleted file mode 100644 index 91e589e68..000000000 --- a/src/unix/SettingsUNIX.cxx +++ /dev/null @@ -1,24 +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-2019 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 "SettingsUNIX.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SettingsUNIX::SettingsUNIX() - : Settings() -{ -} diff --git a/src/unix/SettingsUNIX.hxx b/src/unix/SettingsUNIX.hxx deleted file mode 100644 index 71acbb101..000000000 --- a/src/unix/SettingsUNIX.hxx +++ /dev/null @@ -1,45 +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-2019 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_UNIX_HXX -#define SETTINGS_UNIX_HXX - -#include "Settings.hxx" - -/** - This class defines UNIX-like OS's (Linux) system specific settings. - - @author Stephen Anthony -*/ -class SettingsUNIX : public Settings -{ - public: - /** - Create a new UNIX settings object - */ - explicit SettingsUNIX(); - virtual ~SettingsUNIX() = default; - - private: - // Following constructors and assignment operators not supported - SettingsUNIX(const SettingsUNIX&) = delete; - SettingsUNIX(SettingsUNIX&&) = delete; - SettingsUNIX& operator=(const SettingsUNIX&) = delete; - SettingsUNIX& operator=(SettingsUNIX&&) = delete; -}; - -#endif diff --git a/src/unix/module.mk b/src/unix/module.mk index 052b37a8c..b01b04ffc 100644 --- a/src/unix/module.mk +++ b/src/unix/module.mk @@ -3,11 +3,10 @@ MODULE := src/unix MODULE_OBJS := \ src/unix/FSNodePOSIX.o \ src/unix/OSystemUNIX.o \ - src/unix/SerialPortUNIX.o \ - src/unix/SettingsUNIX.o + src/unix/SerialPortUNIX.o MODULE_DIRS += \ src/unix -# Include common rules +# Include common rules include $(srcdir)/common.rules diff --git a/src/windows/SettingsWINDOWS.cxx b/src/windows/SettingsWINDOWS.cxx deleted file mode 100644 index ec7ac237b..000000000 --- a/src/windows/SettingsWINDOWS.cxx +++ /dev/null @@ -1,24 +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-2019 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 "SettingsWINDOWS.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SettingsWINDOWS::SettingsWINDOWS() - : Settings() -{ -} diff --git a/src/windows/SettingsWINDOWS.hxx b/src/windows/SettingsWINDOWS.hxx deleted file mode 100644 index fd998c491..000000000 --- a/src/windows/SettingsWINDOWS.hxx +++ /dev/null @@ -1,42 +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-2019 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_WINDOWS_HXX -#define SETTINGS_WINDOWS_HXX - -class OSystem; - -#include "Settings.hxx" - -class SettingsWINDOWS : public Settings -{ - public: - /** - Create a new UNIX settings object - */ - explicit SettingsWINDOWS(); - virtual ~SettingsWINDOWS() = default; - - private: - // Following constructors and assignment operators not supported - SettingsWINDOWS(const SettingsWINDOWS&) = delete; - SettingsWINDOWS(SettingsWINDOWS&&) = delete; - SettingsWINDOWS& operator=(const SettingsWINDOWS&) = delete; - SettingsWINDOWS& operator=(SettingsWINDOWS&&) = delete; -}; - -#endif