[Scummvm-git-logs] scummvm master -> b699159689d43f60182f59dbfe9c0ee8cbd93b24

[larsamannen]

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:
b699159689 IOS7: Integrate CoreMIDI into the iOS & tvOS backends


Commit: b699159689d43f60182f59dbfe9c0ee8cbd93b24
    https://github.com/scummvm/scummvm/commit/b699159689d43f60182f59dbfe9c0ee8cbd93b24
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-03-01T15:51:57+01:00

Commit Message:
IOS7: Integrate CoreMIDI into the iOS & tvOS backends

Integrate the existing CoreMIDI implementation used in the MacOS
backend into the iOS7 backend. The CoreMIDI framework is available
from iOS 4.2 and tvOS 15.0.

This allows ScummVM to detect external MIDI devices connected to
the device running ScummVM and to be selected as MIDI music output
device.

Changed paths:
    backends/midi/coremidi.cpp
    backends/module.mk
    base/plugins.cpp
    devtools/create_project/xcode.cpp
    ports.mk


diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index 76b1ea92940..b6fbfa8d12e 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -24,7 +24,7 @@
 
 #include "common/scummsys.h"
 
-#ifdef MACOSX
+#if defined(MACOSX) || defined(IPHONE)
 
 #include "common/config-manager.h"
 #include "common/error.h"
diff --git a/backends/module.mk b/backends/module.mk
index 95f428db387..c61e2a910ee 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -439,6 +439,7 @@ endif
 
 ifdef IPHONE
 MODULE_OBJS += \
+	midi/coremidi.o \
 	mutex/pthread/pthread-mutex.o \
 	graphics/ios/ios-graphics.o \
 	graphics/ios/renderbuffer.o
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 0f134b614db..b39527a5447 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -127,6 +127,8 @@ public:
 		#endif
 		#if defined(MACOSX)
 		LINK_PLUGIN(COREAUDIO)
+		#endif
+		#if defined(MACOSX) || defined(IPHONE)
 		LINK_PLUGIN(COREMIDI)
 		#endif
 		#ifdef USE_FLUIDSYNTH
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 22c449634b6..13bf9b50ed8 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -733,6 +733,7 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 		frameworks_iOS.push_back("AudioToolbox.framework");
 		frameworks_iOS.push_back("QuartzCore.framework");
 		frameworks_iOS.push_back("OpenGLES.framework");
+		frameworks_iOS.push_back("CoreMIDI.framework");
 
 		if (CONTAINS_DEFINE(setup.defines, "USE_TTS")) {
 			frameworks_iOS.push_back("AVFAudio.framework");
@@ -856,6 +857,7 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 		frameworks_tvOS.push_back("AudioToolbox.framework");
 		frameworks_tvOS.push_back("QuartzCore.framework");
 		frameworks_tvOS.push_back("OpenGLES.framework");
+		frameworks_tvOS.push_back("CoreMIDI.framework");
 
 		if (CONTAINS_DEFINE(setup.defines, "USE_TTS")) {
 			frameworks_tvOS.push_back("AVFAudio.framework");
diff --git a/ports.mk b/ports.mk
index caed8d7ab81..d5ddc1730f6 100644
--- a/ports.mk
+++ b/ports.mk
@@ -617,7 +617,8 @@ scummvm-static-ios: $(DETECT_OBJS) $(OBJS)
 		$(OSX_STATIC_LIBS) \
 		-framework UIKit -framework CoreGraphics -framework OpenGLES -framework GameController \
 		-framework CoreFoundation -framework QuartzCore -framework Foundation \
-		-framework AudioToolbox -framework CoreAudio -framework SystemConfiguration -lobjc -lz
+		-framework AudioToolbox -framework CoreAudio -framework CoreMIDI \
+		-framework SystemConfiguration -lobjc -lz
 
 # Special target to create a snapshot disk image for macOS
 # TODO: Replace AUTHORS by Credits.rtf