From e373429ba2d4df2cd60b6cae66d83d0701e13d00 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 3 Jan 2021 00:16:05 +0100 Subject: [PATCH] Refactoring, remove sqlite from libretro build. --- src/common/main.cxx | 3 +- src/common/repository/sqlite/StellaDb.cxx | 12 ++++-- src/common/repository/sqlite/StellaDb.hxx | 2 + src/emucore/OSystem.cxx | 25 +++--------- src/emucore/OSystem.hxx | 28 +++++++------ src/emucore/OSystemStandalone.cxx | 44 +++++++++++++++++++++ src/emucore/OSystemStandalone.hxx | 46 ++++++++++++++++++++++ src/emucore/module.mk | 1 + src/libretro/Makefile.common | 10 +---- src/libretro/OSystemLIBRETRO.cxx | 24 +++++++++++ src/libretro/OSystemLIBRETRO.hxx | 10 +++++ src/libretro/StellaLIBRETRO.cxx | 4 +- src/macos/OSystemMACOS.hxx | 4 +- src/macos/stella.xcodeproj/project.pbxproj | 8 ++++ src/unix/OSystemUNIX.hxx | 4 +- src/unix/r77/OSystemR77.hxx | 4 +- src/windows/OSystemWINDOWS.hxx | 4 +- 17 files changed, 176 insertions(+), 57 deletions(-) create mode 100644 src/emucore/OSystemStandalone.cxx create mode 100644 src/emucore/OSystemStandalone.hxx diff --git a/src/common/main.cxx b/src/common/main.cxx index 9ba6862d2..50586547b 100644 --- a/src/common/main.cxx +++ b/src/common/main.cxx @@ -203,12 +203,11 @@ int main(int ac, char* av[]) // Create the parent OSystem object and initialize settings theOSystem = MediaFactory::createOSystem(); - theOSystem->loadConfig(globalOpts); // Create the full OSystem after the settings, since settings are // probably needed for defaults Logger::debug("Creating the OSystem ..."); - if(!theOSystem->create()) + if(!theOSystem->initialize(globalOpts)) { Logger::error("ERROR: Couldn't create OSystem"); return Cleanup(); diff --git a/src/common/repository/sqlite/StellaDb.cxx b/src/common/repository/sqlite/StellaDb.cxx index f9b4cce17..20d4f07d4 100644 --- a/src/common/repository/sqlite/StellaDb.cxx +++ b/src/common/repository/sqlite/StellaDb.cxx @@ -84,14 +84,20 @@ const string StellaDb::databaseFileName() const return myDb ? FilesystemNode(myDb->fileName()).getShortPath() : "[failed]"; } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +bool StellaDb::isValid() const +{ + return myDb.operator bool(); +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void StellaDb::initializeDb() { importOldSettings(); - + FilesystemNode legacyPropertyFile{myDatabaseDirectory}; legacyPropertyFile /= "stella.pro"; - + if (legacyPropertyFile.exists() && legacyPropertyFile.isFile()) importOldPropset(legacyPropertyFile); @@ -103,7 +109,7 @@ void StellaDb::importOldSettings() { #ifdef BSPF_MACOS Logger::info("importing old settings"); - + mySettingsRepository->save(SettingsRepositoryMACOS().load()); #else #if defined(BSPF_WINDOWS) diff --git a/src/common/repository/sqlite/StellaDb.hxx b/src/common/repository/sqlite/StellaDb.hxx index ba0d59362..86dc7e762 100644 --- a/src/common/repository/sqlite/StellaDb.hxx +++ b/src/common/repository/sqlite/StellaDb.hxx @@ -38,6 +38,8 @@ class StellaDb const string databaseFileName() const; + bool isValid() const; + private: void initializeDb(); diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index c4a5b2869..34dbe4808 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -39,8 +39,6 @@ #include "TimeMachine.hxx" #include "Widget.hxx" #endif - #include "KeyValueRepositorySqlite.hxx" - #include "StellaDb.hxx" #include "FSNode.hxx" #include "MD5.hxx" @@ -115,8 +113,10 @@ OSystem::~OSystem() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -bool OSystem::create() +bool OSystem::initialize(const Settings::Options& options) { + loadConfig(options); + ostringstream buf; buf << "Stella " << STELLA_VERSION << endl << " Features: " << myFeatures << endl @@ -127,8 +127,8 @@ bool OSystem::create() << myStateDir.getShortPath() << "'" << endl << "NVRam directory: '" << myNVRamDir.getShortPath() << "'" << endl - << "Database file: '" - << myStellaDb->databaseFileName() << "'" << endl + << "Persistence: '" + << describePresistence() << "'" << endl << "Cheat file: '" << myCheatFile.getShortPath() << "'" << endl << "Palette file: '" @@ -218,8 +218,7 @@ void OSystem::loadConfig(const Settings::Options& options) if(!myHomeDir.isDirectory()) myHomeDir.makeDir(); - myStellaDb = make_shared(myBaseDir.getPath(), "stella"); - myStellaDb->initialize(); + initPersistence(myBaseDir); mySettings->setRepository(getSettingsRepository()); myPropSet->setRepository(getPropertyRepository()); @@ -869,18 +868,6 @@ void OSystem::mainLoop() #endif } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -shared_ptr OSystem::getSettingsRepository() -{ - return shared_ptr(myStellaDb, &myStellaDb->settingsRepository()); -} - -shared_ptr OSystem::getPropertyRepository() -{ - return shared_ptr(myStellaDb, &myStellaDb->propertyRepository()); -} - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - string OSystem::ourOverrideBaseDir = ""; bool OSystem::ourOverrideBaseDirWithApp = false; diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx index c451cff7a..9f4336e5f 100644 --- a/src/emucore/OSystem.hxx +++ b/src/emucore/OSystem.hxx @@ -48,7 +48,6 @@ class AudioSettings; #ifdef PNG_SUPPORT class PNGLibrary; #endif - class StellaDb; #include @@ -80,7 +79,7 @@ class OSystem /** Create all child objects which belong to this OSystem */ - virtual bool create(); + virtual bool initialize(const Settings::Options& options); /** Creates the various framebuffers/renderers available in this system. @@ -172,13 +171,6 @@ class OSystem */ TimerManager& timer() const { return *myTimerManager; } - /** - This method should be called to initiate the process of loading settings - from the config file. It takes care of loading settings, applying - commandline overrides, and finally validating all settings. - */ - void loadConfig(const Settings::Options& options); - /** This method should be called to save the current settings. It first asks each subsystem to update its settings, then it saves all settings to the @@ -447,9 +439,9 @@ class OSystem */ virtual void stateChanged(EventHandlerState state) { } - virtual shared_ptr getSettingsRepository(); + virtual shared_ptr getSettingsRepository() = 0; - virtual shared_ptr getPropertyRepository(); + virtual shared_ptr getPropertyRepository() = 0; protected: @@ -473,6 +465,10 @@ class OSystem virtual void getBaseDirAndConfig(string& basedir, string& homedir, bool useappdir, const string& usedir) = 0; + virtual void initPersistence(FilesystemNode& basedir) = 0; + + virtual string describePresistence() = 0; + protected: // Pointer to the EventHandler object unique_ptr myEventHandler; @@ -568,9 +564,15 @@ class OSystem static string ourOverrideBaseDir; static bool ourOverrideBaseDirWithApp; - shared_ptr myStellaDb; - private: + + /** + This method should be called to initiate the process of loading settings + from the config file. It takes care of loading settings, applying + commandline overrides, and finally validating all settings. + */ + void loadConfig(const Settings::Options& options); + /** Creates the various sound devices available in this system */ diff --git a/src/emucore/OSystemStandalone.cxx b/src/emucore/OSystemStandalone.cxx new file mode 100644 index 000000000..c8beaa313 --- /dev/null +++ b/src/emucore/OSystemStandalone.cxx @@ -0,0 +1,44 @@ +//============================================================================ +// +// 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-2021 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 "OSystemStandalone.hxx" +#include "StellaDb.hxx" + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +void OSystemStandalone::initPersistence(FilesystemNode& basedir) +{ + myStellaDb = make_shared(basedir.getPath(), "stella"); + myStellaDb->initialize(); +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +string OSystemStandalone::describePresistence() +{ + return (myStellaDb && myStellaDb->isValid()) ? myStellaDb->databaseFileName() : "none"; +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +shared_ptr OSystemStandalone::getSettingsRepository() +{ + return shared_ptr(myStellaDb, &myStellaDb->settingsRepository()); +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +shared_ptr OSystemStandalone::getPropertyRepository() +{ + return shared_ptr(myStellaDb, &myStellaDb->propertyRepository()); +} diff --git a/src/emucore/OSystemStandalone.hxx b/src/emucore/OSystemStandalone.hxx new file mode 100644 index 000000000..a70ca08f6 --- /dev/null +++ b/src/emucore/OSystemStandalone.hxx @@ -0,0 +1,46 @@ +//============================================================================ +// +// 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-2021 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_STANDALONE_HXX +#define OSYSTEM_STANDALONE_HXX + +#include "OSystem.hxx" + +class StellaDb; + +class OSystemStandalone : public OSystem { + public: + + OSystemStandalone() = default; + + shared_ptr getSettingsRepository() override; + + shared_ptr getPropertyRepository() override; + + protected: + + void initPersistence(FilesystemNode& basedir) override; + + string describePresistence() override; + + private: + + shared_ptr myStellaDb; + +}; + +#endif // OSYSTEM_STANDALONE_HXX diff --git a/src/emucore/module.mk b/src/emucore/module.mk index 93a577be9..b061abfa9 100644 --- a/src/emucore/module.mk +++ b/src/emucore/module.mk @@ -75,6 +75,7 @@ MODULE_OBJS := \ src/emucore/MT24LC256.o \ src/emucore/MD5.o \ src/emucore/OSystem.o \ + src/emucore/OSystemStandalone.o \ src/emucore/Paddles.o \ src/emucore/PlusROM.o \ src/emucore/PointingDevice.o \ diff --git a/src/libretro/Makefile.common b/src/libretro/Makefile.common index b7211d89a..b3b876510 100644 --- a/src/libretro/Makefile.common +++ b/src/libretro/Makefile.common @@ -39,13 +39,6 @@ SOURCES_CXX := \ $(CORE_DIR)/common/repository/KeyValueRepositoryConfigfile.cxx \ $(CORE_DIR)/common/repository/KeyValueRepositoryJsonFile.cxx \ $(CORE_DIR)/common/repository/KeyValueRepositoryPropertyFile.cxx \ - $(CORE_DIR)/common/repository/sqlite/AbstractKeyValueRepositorySqlite.cxx \ - $(CORE_DIR)/common/repository/sqlite/CompositeKeyValueRepositorySqlite.cxx \ - $(CORE_DIR)/common/repository/sqlite/KeyValueRepositorySqlite.cxx \ - $(CORE_DIR)/common/repository/sqlite/StellaDb.cxx \ - $(CORE_DIR)/common/repository/sqlite/SqliteDatabase.cxx \ - $(CORE_DIR)/common/repository/sqlite/SqliteStatement.cxx \ - $(CORE_DIR)/common/repository/sqlite/SqliteTransaction.cxx \ $(CORE_DIR)/emucore/AtariVox.cxx \ $(CORE_DIR)/emucore/Bankswitch.cxx \ $(CORE_DIR)/emucore/Booster.cxx \ @@ -149,5 +142,4 @@ SOURCES_CXX := \ $(CORE_DIR)/emucore/TIASurface.cxx \ $(CORE_DIR)/emucore/tia/TIA.cxx -SOURCES_C := \ - $(CORE_DIR)/sqlite/sqlite3.c +SOURCES_C := diff --git a/src/libretro/OSystemLIBRETRO.cxx b/src/libretro/OSystemLIBRETRO.cxx index 52cd82bae..0053451ec 100644 --- a/src/libretro/OSystemLIBRETRO.cxx +++ b/src/libretro/OSystemLIBRETRO.cxx @@ -17,6 +17,8 @@ #include "FSNode.hxx" #include "OSystemLIBRETRO.hxx" +#include "repository/KeyValueRepositoryNoop.hxx" +#include "repository/CompositeKeyValueRepositoryNoop.hxx" #ifdef _WIN32 const string slash = "\\"; @@ -30,3 +32,25 @@ void OSystemLIBRETRO::getBaseDirAndConfig(string& basedir, string& homedir, { basedir = homedir = "." + slash; } + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +void OSystemLIBRETRO::initPersistence(FilesystemNode& basedir) +{} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +string OSystemLIBRETRO::describePresistence() +{ + return "none"; +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +shared_ptr OSystemLIBRETRO::getSettingsRepository() +{ + return make_shared(); +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +shared_ptr OSystemLIBRETRO::getPropertyRepository() +{ + return make_shared(); +} diff --git a/src/libretro/OSystemLIBRETRO.hxx b/src/libretro/OSystemLIBRETRO.hxx index 1eef449c3..e668dfcff 100644 --- a/src/libretro/OSystemLIBRETRO.hxx +++ b/src/libretro/OSystemLIBRETRO.hxx @@ -48,6 +48,16 @@ class OSystemLIBRETRO : public OSystem */ void getBaseDirAndConfig(string& basedir, string& homedir, bool useappdir, const string& usedir) override; + + shared_ptr getSettingsRepository() override; + + shared_ptr getPropertyRepository() override; + + protected: + + void initPersistence(FilesystemNode& basedir) override; + + string describePresistence() override; }; #endif diff --git a/src/libretro/StellaLIBRETRO.cxx b/src/libretro/StellaLIBRETRO.cxx index 584893d6b..5b03821a0 100644 --- a/src/libretro/StellaLIBRETRO.cxx +++ b/src/libretro/StellaLIBRETRO.cxx @@ -47,9 +47,7 @@ bool StellaLIBRETRO::create(bool logging) myOSystem = make_unique(); Settings::Options options; - myOSystem->loadConfig(options); - - myOSystem->create(); + myOSystem->initialize(options); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/macos/OSystemMACOS.hxx b/src/macos/OSystemMACOS.hxx index cd932e692..3a856f5fd 100644 --- a/src/macos/OSystemMACOS.hxx +++ b/src/macos/OSystemMACOS.hxx @@ -18,7 +18,7 @@ #ifndef OSYSTEM_MACOS_HXX #define OSYSTEM_MACOS_HXX -#include "OSystem.hxx" +#include "OSystemStandalone.hxx" /** This class defines an OSystem object for UNIX-like OS's (macOS). @@ -27,7 +27,7 @@ @author Stephen Anthony */ -class OSystemMACOS : public OSystem +class OSystemMACOS : public OSystemStandalone { public: OSystemMACOS() = default; diff --git a/src/macos/stella.xcodeproj/project.pbxproj b/src/macos/stella.xcodeproj/project.pbxproj index 82ec37473..e58dc9639 100644 --- a/src/macos/stella.xcodeproj/project.pbxproj +++ b/src/macos/stella.xcodeproj/project.pbxproj @@ -705,6 +705,8 @@ E034A5EF209FB25D00C89E9E /* EmulationTiming.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E034A5ED209FB25C00C89E9E /* EmulationTiming.hxx */; }; E0406FB61F81A85400A82AE0 /* AbstractFrameManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */; }; E0406FB81F81A85400A82AE0 /* FrameManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */; }; + E050876E25A1337400E4B62A /* OSystemStandalone.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E050876C25A1337400E4B62A /* OSystemStandalone.cxx */; }; + E050876F25A1337400E4B62A /* OSystemStandalone.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E050876D25A1337400E4B62A /* OSystemStandalone.hxx */; }; E06508BE2272447200B341AC /* KeyValueRepositoryNoop.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508B82272447200B341AC /* KeyValueRepositoryNoop.hxx */; }; E06508BF2272447200B341AC /* KeyValueRepository.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508B92272447200B341AC /* KeyValueRepository.hxx */; }; E06508C02272447200B341AC /* KeyValueRepositoryConfigfile.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508BA2272447200B341AC /* KeyValueRepositoryConfigfile.hxx */; }; @@ -1509,6 +1511,8 @@ E0306E0B1F93E916003DDD52 /* JitterEmulation.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = JitterEmulation.hxx; sourceTree = ""; }; E034A5EC209FB25C00C89E9E /* EmulationTiming.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmulationTiming.cxx; sourceTree = ""; }; E034A5ED209FB25C00C89E9E /* EmulationTiming.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = EmulationTiming.hxx; sourceTree = ""; }; + E050876C25A1337400E4B62A /* OSystemStandalone.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OSystemStandalone.cxx; sourceTree = ""; }; + E050876D25A1337400E4B62A /* OSystemStandalone.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OSystemStandalone.hxx; sourceTree = ""; }; E06508B82272447200B341AC /* KeyValueRepositoryNoop.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KeyValueRepositoryNoop.hxx; sourceTree = ""; }; E06508B92272447200B341AC /* KeyValueRepository.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KeyValueRepository.hxx; sourceTree = ""; }; E06508BA2272447200B341AC /* KeyValueRepositoryConfigfile.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KeyValueRepositoryConfigfile.hxx; sourceTree = ""; }; @@ -1944,6 +1948,8 @@ 2D6050CC0898776500C6DE89 /* emucore */ = { isa = PBXGroup; children = ( + E050876C25A1337400E4B62A /* OSystemStandalone.cxx */, + E050876D25A1337400E4B62A /* OSystemStandalone.hxx */, DC1B2EBE1E50036100F62837 /* AmigaMouse.hxx */, DC1B2EC01E50036100F62837 /* AtariMouse.hxx */, DC487FB40DA5350900E12499 /* AtariVox.cxx */, @@ -2858,6 +2864,7 @@ DCBDDE9B1D6A5F0E009DF1E9 /* Cart3EPlusWidget.hxx in Headers */, DCCF4B0314BA27EB00814FAB /* DrivingWidget.hxx in Headers */, DCCF4B0514BA27EB00814FAB /* KeyboardWidget.hxx in Headers */, + E050876F25A1337400E4B62A /* OSystemStandalone.hxx in Headers */, DC5C768F14C26F7C0031EBC7 /* StellaKeys.hxx in Headers */, DC36D2C914CAFAB0007DC821 /* CartFA2.hxx in Headers */, DC56FCDF14CCCC4900A31CC3 /* MouseControl.hxx in Headers */, @@ -3195,6 +3202,7 @@ 2D91750209BA90380026E9FF /* ToggleBitWidget.cxx in Sources */, E0A3841B2589741A0062AA93 /* SqliteDatabase.cxx in Sources */, E0A383FA2589732E0062AA93 /* sqlite3.c in Sources */, + E050876E25A1337400E4B62A /* OSystemStandalone.cxx in Sources */, 2D91750309BA90380026E9FF /* TogglePixelWidget.cxx in Sources */, 2D91750409BA90380026E9FF /* ToggleWidget.cxx in Sources */, 2D91750609BA90380026E9FF /* TiaZoomWidget.cxx in Sources */, diff --git a/src/unix/OSystemUNIX.hxx b/src/unix/OSystemUNIX.hxx index aa7a0908c..db693f435 100644 --- a/src/unix/OSystemUNIX.hxx +++ b/src/unix/OSystemUNIX.hxx @@ -18,7 +18,7 @@ #ifndef OSYSTEM_UNIX_HXX #define OSYSTEM_UNIX_HXX -#include "OSystem.hxx" +#include "OSystemStandalone.hxx" /** This class defines an OSystem object for UNIX-like OS's (Linux). @@ -27,7 +27,7 @@ @author Stephen Anthony */ -class OSystemUNIX : public OSystem +class OSystemUNIX : public OSystemStandalone { public: OSystemUNIX() = default; diff --git a/src/unix/r77/OSystemR77.hxx b/src/unix/r77/OSystemR77.hxx index ee2f435c7..3f7878ef4 100644 --- a/src/unix/r77/OSystemR77.hxx +++ b/src/unix/r77/OSystemR77.hxx @@ -18,7 +18,7 @@ #ifndef OSYSTEM_R77_HXX #define OSYSTEM_R77_HXX -#include "OSystem.hxx" +#include "OSystemStandalone.hxx" /** This class defines an OSystem object for the Retron77 system. @@ -29,7 +29,7 @@ @author Stephen Anthony */ -class OSystemR77 : public OSystem +class OSystemR77 : public OSystemStandalone { public: OSystemR77() = default; diff --git a/src/windows/OSystemWINDOWS.hxx b/src/windows/OSystemWINDOWS.hxx index 4f4b3c7d5..903f00dc6 100644 --- a/src/windows/OSystemWINDOWS.hxx +++ b/src/windows/OSystemWINDOWS.hxx @@ -18,7 +18,7 @@ #ifndef OSYSTEM_WINDOWS_HXX #define OSYSTEM_WINDOWS_HXX -#include "OSystem.hxx" +#include "OSystemStandalone.hxx" /** This class defines an OSystem object for Windows OS's. @@ -27,7 +27,7 @@ @author Stephen Anthony */ -class OSystemWINDOWS : public OSystem +class OSystemWINDOWS : public OSystemStandalone { public: OSystemWINDOWS() = default;