From 3041728e06ee09370593476e3d7155ca4a5afc28 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 15 Jul 2022 17:08:41 -0700
Subject: [PATCH] Updated Xcode project for libxmp 4.5.1
---
Xcode/config.xcconfig | 4 +-
.../xmp-lite.xcodeproj/project.pbxproj | 42 +++----------------
external/libxmp | 2 +-
3 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/Xcode/config.xcconfig b/Xcode/config.xcconfig
index 2a7022f9..517a1412 100644
--- a/Xcode/config.xcconfig
+++ b/Xcode/config.xcconfig
@@ -11,8 +11,8 @@
// Uncomment these lines to enable MOD support
// If you do this, you should run external/download.sh to download the decode libraries and add xmp.framework to your application bundle.
-CONFIG_PREPROCESSOR_DEFINITIONS = $(inherited) MUSIC_MOD_XMP LIBXMP_HEADER=\"../external/libxmp/include/xmp.h\"
-CONFIG_FRAMEWORK_LDFLAGS = $(inherited) -weak_framework xmp_lite
+//CONFIG_PREPROCESSOR_DEFINITIONS = $(inherited) MUSIC_MOD_XMP LIBXMP_HEADER=\"../external/libxmp/include/xmp.h\"
+//CONFIG_FRAMEWORK_LDFLAGS = $(inherited) -weak_framework xmp_lite
// Uncomment these lines to enable Opus support
// If you do this, you should run external/download.sh to download the decode libraries and add opus.framework to your application bundle.
diff --git a/Xcode/xmp-lite/xmp-lite.xcodeproj/project.pbxproj b/Xcode/xmp-lite/xmp-lite.xcodeproj/project.pbxproj
index 538cc68f..91ba7ae3 100644
--- a/Xcode/xmp-lite/xmp-lite.xcodeproj/project.pbxproj
+++ b/Xcode/xmp-lite/xmp-lite.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
F3E29CEE2881FC900006D108 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = F3E29CEB2881FC900006D108 /* common.c */; };
F3E29CEF2881FC900006D108 /* sample.c in Sources */ = {isa = PBXBuildFile; fileRef = F3E29CEC2881FC900006D108 /* sample.c */; };
F3E29CF02881FC900006D108 /* itsex.c in Sources */ = {isa = PBXBuildFile; fileRef = F3E29CED2881FC900006D108 /* itsex.c */; };
+ F3E29D6F288237030006D108 /* filetype.c in Sources */ = {isa = PBXBuildFile; fileRef = F3E29D6E288237030006D108 /* filetype.c */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -67,6 +68,7 @@
F3E29CEB2881FC900006D108 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../../external/libxmp/src/loaders/common.c; sourceTree = "<group>"; };
F3E29CEC2881FC900006D108 /* sample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sample.c; path = ../../external/libxmp/src/loaders/sample.c; sourceTree = "<group>"; };
F3E29CED2881FC900006D108 /* itsex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = itsex.c; path = ../../external/libxmp/src/loaders/itsex.c; sourceTree = "<group>"; };
+ F3E29D6E288237030006D108 /* filetype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filetype.c; path = ../../external/libxmp/src/filetype.c; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -119,6 +121,7 @@
F3023FBD2881DB7C002F32D6 /* control.c */,
F3023FC82881DB7C002F32D6 /* dataio.c */,
F3023FB42881DB7C002F32D6 /* effects.c */,
+ F3E29D6E288237030006D108 /* filetype.c */,
F3023FBC2881DB7C002F32D6 /* filter.c */,
F3E29CE72881FB610006D108 /* format.c */,
F3023FC22881DB7C002F32D6 /* hio.c */,
@@ -243,6 +246,7 @@
F3023FE02881DB7C002F32D6 /* memio.c in Sources */,
F3023FDF2881DB7C002F32D6 /* mix_all.c in Sources */,
F3023FD62881DB7C002F32D6 /* filter.c in Sources */,
+ F3E29D6F288237030006D108 /* filetype.c in Sources */,
F3023FE42881DB7C002F32D6 /* load.c in Sources */,
F3023FE12881DB7C002F32D6 /* player.c in Sources */,
F3023FD82881DB7C002F32D6 /* period.c in Sources */,
@@ -308,24 +312,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- HAVE_STDIO_H,
- HAVE_STDLIB_H,
- HAVE_STRING_H,
- HAVE_INTTYPES_H,
- HAVE_STDINT_H,
- HAVE_STRINGS_H,
- HAVE_SYS_STAT_H,
- HAVE_SYS_TYPES_H,
- HAVE_UNISTD_H,
- STDC_HEADERS,
- HAVE_LIBM,
- HAVE_ROUND,
- HAVE_POWF,
- LIBXMP_CORE_PLAYER,
- LIBXMP_NO_DEPACKERS,
- LIBXMP_NO_PROWIZARD,
- );
+ GCC_PREPROCESSOR_DEFINITIONS = LIBXMP_CORE_PLAYER;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -388,24 +375,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREPROCESSOR_DEFINITIONS = (
- HAVE_STDIO_H,
- HAVE_STDLIB_H,
- HAVE_STRING_H,
- HAVE_INTTYPES_H,
- HAVE_STDINT_H,
- HAVE_STRINGS_H,
- HAVE_SYS_STAT_H,
- HAVE_SYS_TYPES_H,
- HAVE_UNISTD_H,
- STDC_HEADERS,
- HAVE_LIBM,
- HAVE_ROUND,
- HAVE_POWF,
- LIBXMP_CORE_PLAYER,
- LIBXMP_NO_DEPACKERS,
- LIBXMP_NO_PROWIZARD,
- );
+ GCC_PREPROCESSOR_DEFINITIONS = LIBXMP_CORE_PLAYER;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
diff --git a/external/libxmp b/external/libxmp
index ed33ba17..1d71f847 160000
--- a/external/libxmp
+++ b/external/libxmp
@@ -1 +1 @@
-Subproject commit ed33ba17fc17a1e2556daafc2319a63f6193ce51
+Subproject commit 1d71f84719ab970606c46ea824b7d5a7a014feaf