[Scummvm-git-logs] scummvm master -> ead06bd508a4debfb0e5b32355ff942058e79b3f
lephilousophe
noreply at scummvm.org
Thu Apr 16 05:35:06 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ead06bd508 IOS7: Fix build
Commit: ead06bd508a4debfb0e5b32355ff942058e79b3f
https://github.com/scummvm/scummvm/commit/ead06bd508a4debfb0e5b32355ff942058e79b3f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-04-16T07:33:03+02:00
Commit Message:
IOS7: Fix build
Platform was forgotten in fb175a893ea8ef711ee20930ffbf54794e6b5d97.
Changed paths:
backends/platform/ios7/ios7_osys_main.cpp
backends/platform/ios7/ios7_osys_main.h
backends/platform/ios7/ios7_osys_misc.mm
backends/platform/ios7/ios7_osys_video.mm
diff --git a/backends/platform/ios7/ios7_osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp
index df5dd30f2d4..c09fc56eff0 100644
--- a/backends/platform/ios7/ios7_osys_main.cpp
+++ b/backends/platform/ios7/ios7_osys_main.cpp
@@ -47,6 +47,7 @@
#include "graphics/cursorman.h"
#include "gui/gui-manager.h"
+#include "backends/events/default/default-events.h"
#include "backends/graphics/ios/ios-graphics.h"
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
@@ -153,6 +154,8 @@ int OSystem_iOS7::timerHandler(int t) {
}
void OSystem_iOS7::initBackend() {
+ _eventManager = new DefaultEventManager(this);
+
_savefileManager = new SandboxedSaveFileManager(Common::Path(_chrootBasePath, Common::Path::kNativeSeparator), "/Savegames");
_timerManager = new DefaultTimerManager();
@@ -172,7 +175,7 @@ void OSystem_iOS7::initBackend() {
ConfMan.registerDefault("iconspath", Common::Path("/"));
- EventsBaseBackend::initBackend();
+ BaseBackend::initBackend();
}
bool OSystem_iOS7::hasFeature(Feature f) {
diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index df74599e15b..862345e54f8 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -50,7 +50,7 @@ struct AQCallbackStruct {
AudioStreamBasicDescription dataFormat;
};
-class OSystem_iOS7 : public ModularGraphicsBackend, public EventsBaseBackend {
+class OSystem_iOS7 : virtual public BaseBackend, public ModularGraphicsBackend, Common::EventSource {
protected:
static AQCallbackStruct s_AudioQueue;
static SoundProc s_soundCallback;
diff --git a/backends/platform/ios7/ios7_osys_misc.mm b/backends/platform/ios7/ios7_osys_misc.mm
index 5c5accb314d..bdaded2f37b 100644
--- a/backends/platform/ios7/ios7_osys_misc.mm
+++ b/backends/platform/ios7/ios7_osys_misc.mm
@@ -51,7 +51,7 @@ void OSystem_iOS7::updateStartSettings(const Common::String &executable, Common:
// Check if scummvm is running from an app bundle
if (!bundle || ![bundle bundleIdentifier]) {
// Use default autostart implementation
- EventsBaseBackend::updateStartSettings(executable, command, settings, additionalArgs);
+ BaseBackend::updateStartSettings(executable, command, settings, additionalArgs);
return;
}
diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 08157bc7bf0..b1d5a0dee2b 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -87,7 +87,7 @@ static inline void execute_on_main_thread(void (^block)(void)) {
}
void OSystem_iOS7::engineInit() {
- EventsBaseBackend::engineInit();
+ BaseBackend::engineInit();
// Prevent the device going to sleep during game play (and in particular cut scenes)
dispatch_async(dispatch_get_main_queue(), ^{
[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
@@ -111,7 +111,7 @@ void OSystem_iOS7::engineInit() {
}
void OSystem_iOS7::engineDone() {
- EventsBaseBackend::engineDone();
+ BaseBackend::engineDone();
// Allow the device going to sleep if idle while in the Launcher
dispatch_async(dispatch_get_main_queue(), ^{
[[UIApplication sharedApplication] setIdleTimerDisabled:NO];
@@ -130,7 +130,7 @@ void OSystem_iOS7::engineDone() {
}
void OSystem_iOS7::taskStarted(Task task) {
- EventsBaseBackend::taskStarted(task);
+ BaseBackend::taskStarted(task);
if (_runningTasks++ == 0) {
// Prevent the device going to sleep while a task is running
dispatch_async(dispatch_get_main_queue(), ^{
@@ -139,7 +139,7 @@ void OSystem_iOS7::taskStarted(Task task) {
}
}
void OSystem_iOS7::taskFinished(Task task) {
- EventsBaseBackend::taskFinished(task);
+ BaseBackend::taskFinished(task);
if (--_runningTasks == 0) {
dispatch_async(dispatch_get_main_queue(), ^{
[[UIApplication sharedApplication] setIdleTimerDisabled:NO];
More information about the Scummvm-git-logs
mailing list