[Scummvm-git-logs] scummvm master -> 95a1a4bf422ad2b3fc7aba48f6b47d3194a98255

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
3e6f5ec2b4 CONFIGURE, MIDI, CREATE_PROJECT: Add IPHONE_TVOS definition
95a1a4bf42 CONFIGURE: Add CoreMIDI framework to iOS7 backend


Commit: 3e6f5ec2b41342b6cbf26ed71b83b57dad71aef6
    https://github.com/scummvm/scummvm/commit/3e6f5ec2b41342b6cbf26ed71b83b57dad71aef6
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-03-01T17:31:11+01:00

Commit Message:
CONFIGURE, MIDI, CREATE_PROJECT: Add IPHONE_TVOS definition

iOS and tvOS shares much of the same code. Normally all differences
between the targets are handled in the backend where Xcode specific
pre-processor macros can be used to distinguish the platforms.

In shared code, even if it's still Apple specific, we need a define
to separate the iOS and tvOS targets. Add such and use it in the
shared CoreMIDI code. This fixes buildbot issues.

Changed paths:
    backends/midi/coremidi.cpp
    configure
    devtools/create_project/xcode.cpp


diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index b6fbfa8d12e..c5fa3e04f64 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -24,7 +24,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(MACOSX) || defined(IPHONE)
+#if defined(MACOSX) || defined(IPHONE) && !defined(IPHONE_TVOS)
 
 #include "common/config-manager.h"
 #include "common/error.h"
diff --git a/configure b/configure
index e289f48a62a..5149a70245b 100755
--- a/configure
+++ b/configure
@@ -4143,7 +4143,7 @@ if test -n "$_host"; then
 			;;
 		tvos)
 			add_line_to_config_mk 'IPHONE = 1'
-			append_var DEFINES "-DIPHONE -DIPHONE_IOS7"
+			append_var DEFINES "-DIPHONE -DIPHONE_IOS7 -DIPHONE_TVOS"
 			_backend="ios7"
 			_seq_midi=no
 			_timidity=no
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 13bf9b50ed8..d4d3b547c36 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1579,6 +1579,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 		ADD_SETTING_QUOTE(tvOS_Debug, "TARGETED_DEVICE_FAMILY", "3");
 		ValueList scummvmTVOSsimulator_defines;
 		ADD_DEFINE(scummvmTVOSsimulator_defines, "\"$(inherited)\"");
+		ADD_DEFINE(scummvmTVOSsimulator_defines, "IPHONE_TVOS");
 		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET"))
 			ADD_DEFINE(scummvmTVOSsimulator_defines, "WITHOUT_SDL");
 		ADD_SETTING_LIST(tvOS_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*]\"", scummvmTVOSsimulator_defines, kSettingsNoQuote | kSettingsAsList, 5);


Commit: 95a1a4bf422ad2b3fc7aba48f6b47d3194a98255
    https://github.com/scummvm/scummvm/commit/95a1a4bf422ad2b3fc7aba48f6b47d3194a98255
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-03-01T17:31:11+01:00

Commit Message:
CONFIGURE: Add CoreMIDI framework to iOS7 backend

The CoreMIDI framework was missed when building the iOS7 port using
configure. Add it.

Changed paths:
    configure


diff --git a/configure b/configure
index 5149a70245b..b6e7270297e 100755
--- a/configure
+++ b/configure
@@ -4269,8 +4269,8 @@ case $_backend in
 	ios7)
 		append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES"
 		append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation"
-		append_var LIBS "-framework AudioToolbox -framework CoreAudio -framework SystemConfiguration "
-		append_var LIBS "-framework GameController"
+		append_var LIBS "-framework AudioToolbox -framework CoreAudio -framework SystemConfiguration"
+		append_var LIBS "-framework GameController -framework CoreMIDI"
 		if test "$_host" = 'tvos'; then
 			append_var LDFLAGS "-mtvos-version-min=9 -arch arm64"
 			append_var CFLAGS "-mtvos-version-min=9 -arch arm64"