ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete platform specific settings classes.

This commit is contained in:
Christian Speckner 2019-04-26 22:22:32 +02:00
parent 126464f66f
commit f26f4e53c6
12 changed files with 5 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/MediaFactory.hxx
View File

@ -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<Settings> createSettings()
{
#if defined(BSPF_UNIX)
#if defined(RETRON77)
return make_unique<SettingsR77>();
#else
return make_unique<SettingsUNIX>();
#endif
#elif defined(BSPF_WINDOWS)
return make_unique<SettingsWINDOWS>();
#elif defined(BSPF_MACOS)
return make_unique<SettingsMACOS>();
#elif defined(__LIB_RETRO__)
return make_unique<SettingsLIBRETRO>();
#ifdef RETRON77
return make_unique<SettingsR77>();
#else
#error Unsupported platform for Settings!
return make_unique<Settings>();
#endif
}

1
src/libretro/Makefile.common
View File

@ -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 \

24
src/libretro/SettingsLIBRETRO.cxx
View File

@ -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()
{
}

42
src/libretro/SettingsLIBRETRO.hxx
View File

@ -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

24
src/macos/SettingsMACOS.cxx
View File

@ -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()
{
}

45
src/macos/SettingsMACOS.hxx
View File

@ -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

8
src/macos/stella.xcodeproj/project.pbxproj
View File

@ -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 = "<group>"; };
E06508C82272493200B341AC /* SettingsRepositoryMACOS.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = SettingsRepositoryMACOS.hxx; sourceTree = "<group>"; };
E06508C92272493200B341AC /* SettingsRepositoryMACOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsRepositoryMACOS.mm; sourceTree = "<group>"; };
E06508D02272671600B341AC /* SettingsMACOS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsMACOS.cxx; sourceTree = "<group>"; };
E06508D12272671600B341AC /* SettingsMACOS.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SettingsMACOS.hxx; sourceTree = "<group>"; };
E07C2326226393BD00B78631 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
E0893AF0211B9841008B170D /* HighPass.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HighPass.cxx; path = audio/HighPass.cxx; sourceTree = "<group>"; };
E0893AF1211B9841008B170D /* HighPass.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = HighPass.hxx; path = audio/HighPass.hxx; sourceTree = "<group>"; };
@ -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;
};

24
src/unix/SettingsUNIX.cxx
View File

@ -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()
{
}

45
src/unix/SettingsUNIX.hxx
View File

@ -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

5
src/unix/module.mk
View File

@ -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

24
src/windows/SettingsWINDOWS.cxx
View File

@ -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()
{
}

42
src/windows/SettingsWINDOWS.hxx
View File

@ -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