From 582679c0b717ece5cb934aa58165883fb672086a Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 2 May 2022 01:19:36 -0700
Subject: [PATCH] Correctly use the Tremor library when building for older iOS
devices
---
Xcode/SDL_mixer.xcodeproj/project.pbxproj | 2 ++
Xcode/config.xcconfig | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Xcode/SDL_mixer.xcodeproj/project.pbxproj b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
index 2fe39e30..24a0b399 100644
--- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
@@ -1121,6 +1121,7 @@
"$(MUSIC_MID)",
"$(MUSIC_MID_NATIVE)",
"$(MUSIC_OGG)",
+ "$(MUSIC_OGG_USE_TREMOR)",
"$(MUSIC_FLAC)",
"$(MUSIC_OPUS)",
"MPG123_HEADER=\"<mpg123/mpg123.h>\"",
@@ -1175,6 +1176,7 @@
"$(MUSIC_MID)",
"$(MUSIC_MID_NATIVE)",
"$(MUSIC_OGG)",
+ "$(MUSIC_OGG_USE_TREMOR)",
"$(MUSIC_FLAC)",
"$(MUSIC_OPUS)",
"MPG123_HEADER=\"<mpg123/mpg123.h>\"",
diff --git a/Xcode/config.xcconfig b/Xcode/config.xcconfig
index d84d4783..f16685ab 100644
--- a/Xcode/config.xcconfig
+++ b/Xcode/config.xcconfig
@@ -21,10 +21,11 @@ MUSIC_MID_NATIVE =
MUSIC_MID_NATIVE[sdk=mac*] = MUSIC_MID_NATIVE
MUSIC_OGG = MUSIC_OGG
+MUSIC_OGG_USE_TREMOR =
+MUSIC_OGG_USE_TREMOR[arch=armv7] = OGG_USE_TREMOR
+VORBIS_FRAMEWORK = vorbis
+VORBIS_FRAMEWORK[arch=armv7] = tremor
MUSIC_FLAC = MUSIC_FLAC
MUSIC_OPUS = MUSIC_OPUS
-
-VORBIS_FRAMEWORK = vorbis
-VORBIS_FRAMEWORK[arch=armv7] = tremor