From 88f8f41e403559fd0737089606c58716d400a93e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 21 Oct 2017 11:38:48 -0700 Subject: [PATCH] Updated the iOS project and added FLAC music support --- README.txt | 7 +- Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj | 220 +++++++++++++++++- external/flac-1.3.2/src/libFLAC/format.c | 3 + 3 files changed, 222 insertions(+), 8 deletions(-) diff --git a/README.txt b/README.txt index e1c92eba..523fcf1e 100644 --- a/README.txt +++ b/README.txt @@ -39,11 +39,16 @@ environment variable to a Sound Font 2 (.sf2) file containing the musical instruments you want to use for MIDI playback. (On some Linux distributions you can install the fluid-soundfont-gm package) - To play MIDI files using Timidity, you'll need to get a complete set of GUS patches from: http://www.libsdl.org/projects/mixer/timidity/timidity.tar.gz and unpack them in /usr/local/lib under UNIX, and C:\ under Win32. +iOS: +In order to use this library on iOS, you should include the SDL.xcodeproj +and Xcode-iOS/SDL_mixer.xcodeproj in your application, add the SDL/include +and SDL_mixer directories to your "Header Search Paths" setting, then add the +libSDL2.a and libSDL2_mixer.a to your "Link Binary with Libraries" setting. + This library is under the zlib license, see the file "COPYING.txt" for details. diff --git a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj index eba2ebce..3500eb82 100755 --- a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj +++ b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj @@ -7,6 +7,41 @@ objects = { /* Begin PBXBuildFile section */ + AA1C71151F9BC66000A6BC31 /* effect_position.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71131F9BC66000A6BC31 /* effect_position.c */; }; + AA1C71161F9BC66000A6BC31 /* effect_stereoreverse.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71141F9BC66000A6BC31 /* effect_stereoreverse.c */; }; + AA1C71191F9BC67200A6BC31 /* effects_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = AA1C71171F9BC67100A6BC31 /* effects_internal.h */; }; + AA1C711A1F9BC67200A6BC31 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71181F9BC67200A6BC31 /* effects_internal.c */; }; + AA1C711C1F9BC6AD00A6BC31 /* load_mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA1C711B1F9BC6AD00A6BC31 /* load_mod.cpp */; }; + AA1C713D1F9BC92000A6BC31 /* bitreader.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C711F1F9BC91C00A6BC31 /* bitreader.c */; }; + AA1C713E1F9BC92000A6BC31 /* cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71201F9BC91C00A6BC31 /* cpu.c */; }; + AA1C713F1F9BC92000A6BC31 /* format.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71211F9BC91C00A6BC31 /* format.c */; }; + AA1C71401F9BC92000A6BC31 /* lpc_intrin_sse41.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71221F9BC91C00A6BC31 /* lpc_intrin_sse41.c */; }; + AA1C71411F9BC92000A6BC31 /* bitwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71231F9BC91C00A6BC31 /* bitwriter.c */; }; + AA1C71421F9BC92000A6BC31 /* stream_encoder_intrin_ssse3.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71241F9BC91D00A6BC31 /* stream_encoder_intrin_ssse3.c */; }; + AA1C71431F9BC92000A6BC31 /* stream_encoder_framing.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71251F9BC91D00A6BC31 /* stream_encoder_framing.c */; }; + AA1C71441F9BC92000A6BC31 /* bitmath.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71261F9BC91D00A6BC31 /* bitmath.c */; }; + AA1C71451F9BC92000A6BC31 /* ogg_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71271F9BC91D00A6BC31 /* ogg_helper.c */; }; + AA1C71461F9BC92000A6BC31 /* fixed_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71281F9BC91D00A6BC31 /* fixed_intrin_sse2.c */; }; + AA1C71471F9BC92000A6BC31 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71291F9BC91D00A6BC31 /* window.c */; }; + AA1C71481F9BC92000A6BC31 /* crc.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C712A1F9BC91D00A6BC31 /* crc.c */; }; + AA1C71491F9BC92000A6BC31 /* lpc_intrin_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C712B1F9BC91D00A6BC31 /* lpc_intrin_sse.c */; }; + AA1C714A1F9BC92000A6BC31 /* stream_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C712C1F9BC91D00A6BC31 /* stream_decoder.c */; }; + AA1C714B1F9BC92000A6BC31 /* fixed.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C712D1F9BC91E00A6BC31 /* fixed.c */; }; + AA1C714C1F9BC92000A6BC31 /* stream_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C712E1F9BC91E00A6BC31 /* stream_encoder.c */; }; + AA1C714D1F9BC92000A6BC31 /* lpc.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C712F1F9BC91E00A6BC31 /* lpc.c */; }; + AA1C714E1F9BC92000A6BC31 /* stream_encoder_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71301F9BC91E00A6BC31 /* stream_encoder_intrin_sse2.c */; }; + AA1C714F1F9BC92000A6BC31 /* lpc_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71311F9BC91E00A6BC31 /* lpc_intrin_sse2.c */; }; + AA1C71501F9BC92000A6BC31 /* fixed_intrin_ssse3.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71321F9BC91E00A6BC31 /* fixed_intrin_ssse3.c */; }; + AA1C71511F9BC92000A6BC31 /* metadata_object.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71331F9BC91E00A6BC31 /* metadata_object.c */; }; + AA1C71521F9BC92000A6BC31 /* lpc_intrin_avx2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71341F9BC91F00A6BC31 /* lpc_intrin_avx2.c */; }; + AA1C71531F9BC92000A6BC31 /* ogg_encoder_aspect.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71351F9BC91F00A6BC31 /* ogg_encoder_aspect.c */; }; + AA1C71541F9BC92000A6BC31 /* stream_encoder_intrin_avx2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71361F9BC91F00A6BC31 /* stream_encoder_intrin_avx2.c */; }; + AA1C71551F9BC92000A6BC31 /* ogg_decoder_aspect.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71371F9BC91F00A6BC31 /* ogg_decoder_aspect.c */; }; + AA1C71561F9BC92000A6BC31 /* float.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71381F9BC91F00A6BC31 /* float.c */; }; + AA1C71571F9BC92000A6BC31 /* metadata_iterators.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71391F9BC91F00A6BC31 /* metadata_iterators.c */; }; + AA1C71581F9BC92000A6BC31 /* ogg_mapping.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C713A1F9BC91F00A6BC31 /* ogg_mapping.c */; }; + AA1C71591F9BC92000A6BC31 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C713B1F9BC92000A6BC31 /* memory.c */; }; + AA1C715A1F9BC92000A6BC31 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C713C1F9BC92000A6BC31 /* md5.c */; }; AA60217217653A9800662B9C /* fastmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60214D17653A9800662B9C /* fastmix.cpp */; }; AA60217317653A9800662B9C /* load_669.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60214E17653A9800662B9C /* load_669.cpp */; }; AA60217417653A9800662B9C /* load_abc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60214F17653A9800662B9C /* load_abc.cpp */; }; @@ -129,6 +164,41 @@ /* Begin PBXFileReference section */ 1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = ../SDL_mixer.h; sourceTree = SOURCE_ROOT; }; + AA1C71131F9BC66000A6BC31 /* effect_position.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effect_position.c; path = ../effect_position.c; sourceTree = ""; }; + AA1C71141F9BC66000A6BC31 /* effect_stereoreverse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effect_stereoreverse.c; path = ../effect_stereoreverse.c; sourceTree = ""; }; + AA1C71171F9BC67100A6BC31 /* effects_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = effects_internal.h; path = ../effects_internal.h; sourceTree = ""; }; + AA1C71181F9BC67200A6BC31 /* effects_internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effects_internal.c; path = ../effects_internal.c; sourceTree = ""; }; + AA1C711B1F9BC6AD00A6BC31 /* load_mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mod.cpp; path = src/load_mod.cpp; sourceTree = ""; }; + AA1C711F1F9BC91C00A6BC31 /* bitreader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bitreader.c; path = src/libFLAC/bitreader.c; sourceTree = ""; }; + AA1C71201F9BC91C00A6BC31 /* cpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cpu.c; path = src/libFLAC/cpu.c; sourceTree = ""; }; + AA1C71211F9BC91C00A6BC31 /* format.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = format.c; path = src/libFLAC/format.c; sourceTree = ""; }; + AA1C71221F9BC91C00A6BC31 /* lpc_intrin_sse41.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpc_intrin_sse41.c; path = src/libFLAC/lpc_intrin_sse41.c; sourceTree = ""; }; + AA1C71231F9BC91C00A6BC31 /* bitwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bitwriter.c; path = src/libFLAC/bitwriter.c; sourceTree = ""; }; + AA1C71241F9BC91D00A6BC31 /* stream_encoder_intrin_ssse3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stream_encoder_intrin_ssse3.c; path = src/libFLAC/stream_encoder_intrin_ssse3.c; sourceTree = ""; }; + AA1C71251F9BC91D00A6BC31 /* stream_encoder_framing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stream_encoder_framing.c; path = src/libFLAC/stream_encoder_framing.c; sourceTree = ""; }; + AA1C71261F9BC91D00A6BC31 /* bitmath.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bitmath.c; path = src/libFLAC/bitmath.c; sourceTree = ""; }; + AA1C71271F9BC91D00A6BC31 /* ogg_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_helper.c; path = src/libFLAC/ogg_helper.c; sourceTree = ""; }; + AA1C71281F9BC91D00A6BC31 /* fixed_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fixed_intrin_sse2.c; path = src/libFLAC/fixed_intrin_sse2.c; sourceTree = ""; }; + AA1C71291F9BC91D00A6BC31 /* window.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = window.c; path = src/libFLAC/window.c; sourceTree = ""; }; + AA1C712A1F9BC91D00A6BC31 /* crc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crc.c; path = src/libFLAC/crc.c; sourceTree = ""; }; + AA1C712B1F9BC91D00A6BC31 /* lpc_intrin_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpc_intrin_sse.c; path = src/libFLAC/lpc_intrin_sse.c; sourceTree = ""; }; + AA1C712C1F9BC91D00A6BC31 /* stream_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stream_decoder.c; path = src/libFLAC/stream_decoder.c; sourceTree = ""; }; + AA1C712D1F9BC91E00A6BC31 /* fixed.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fixed.c; path = src/libFLAC/fixed.c; sourceTree = ""; }; + AA1C712E1F9BC91E00A6BC31 /* stream_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stream_encoder.c; path = src/libFLAC/stream_encoder.c; sourceTree = ""; }; + AA1C712F1F9BC91E00A6BC31 /* lpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpc.c; path = src/libFLAC/lpc.c; sourceTree = ""; }; + AA1C71301F9BC91E00A6BC31 /* stream_encoder_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stream_encoder_intrin_sse2.c; path = src/libFLAC/stream_encoder_intrin_sse2.c; sourceTree = ""; }; + AA1C71311F9BC91E00A6BC31 /* lpc_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpc_intrin_sse2.c; path = src/libFLAC/lpc_intrin_sse2.c; sourceTree = ""; }; + AA1C71321F9BC91E00A6BC31 /* fixed_intrin_ssse3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fixed_intrin_ssse3.c; path = src/libFLAC/fixed_intrin_ssse3.c; sourceTree = ""; }; + AA1C71331F9BC91E00A6BC31 /* metadata_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = metadata_object.c; path = src/libFLAC/metadata_object.c; sourceTree = ""; }; + AA1C71341F9BC91F00A6BC31 /* lpc_intrin_avx2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpc_intrin_avx2.c; path = src/libFLAC/lpc_intrin_avx2.c; sourceTree = ""; }; + AA1C71351F9BC91F00A6BC31 /* ogg_encoder_aspect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_encoder_aspect.c; path = src/libFLAC/ogg_encoder_aspect.c; sourceTree = ""; }; + AA1C71361F9BC91F00A6BC31 /* stream_encoder_intrin_avx2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stream_encoder_intrin_avx2.c; path = src/libFLAC/stream_encoder_intrin_avx2.c; sourceTree = ""; }; + AA1C71371F9BC91F00A6BC31 /* ogg_decoder_aspect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_decoder_aspect.c; path = src/libFLAC/ogg_decoder_aspect.c; sourceTree = ""; }; + AA1C71381F9BC91F00A6BC31 /* float.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = float.c; path = src/libFLAC/float.c; sourceTree = ""; }; + AA1C71391F9BC91F00A6BC31 /* metadata_iterators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = metadata_iterators.c; path = src/libFLAC/metadata_iterators.c; sourceTree = ""; }; + AA1C713A1F9BC91F00A6BC31 /* ogg_mapping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_mapping.c; path = src/libFLAC/ogg_mapping.c; sourceTree = ""; }; + AA1C713B1F9BC92000A6BC31 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = memory.c; path = src/libFLAC/memory.c; sourceTree = ""; }; + AA1C713C1F9BC92000A6BC31 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = src/libFLAC/md5.c; sourceTree = ""; }; AA60214D17653A9800662B9C /* fastmix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fastmix.cpp; path = src/fastmix.cpp; sourceTree = ""; }; AA60214E17653A9800662B9C /* load_669.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_669.cpp; path = src/load_669.cpp; sourceTree = ""; }; AA60214F17653A9800662B9C /* load_abc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_abc.cpp; path = src/load_abc.cpp; sourceTree = ""; }; @@ -298,9 +368,14 @@ 08FB77ACFE841707C02AAC07 /* Library Source */ = { isa = PBXGroup; children = ( + AA1C711E1F9BC87800A6BC31 /* flac */, AA60214C17653A5900662B9C /* modplug */, 5CC1B87F012FB8CD7F000001 /* timidity */, AA644291175B0D6E00A2125A /* tremor */, + AA1C71131F9BC66000A6BC31 /* effect_position.c */, + AA1C71141F9BC66000A6BC31 /* effect_stereoreverse.c */, + AA1C71181F9BC67200A6BC31 /* effects_internal.c */, + AA1C71171F9BC67100A6BC31 /* effects_internal.h */, AAE406061F9609B900EDAF53 /* load_aiff.c */, AAE406181F9609BA00EDAF53 /* load_aiff.h */, AAE406141F9609BA00EDAF53 /* load_voc.c */, @@ -364,6 +439,44 @@ path = ../timidity; sourceTree = ""; }; + AA1C711E1F9BC87800A6BC31 /* flac */ = { + isa = PBXGroup; + children = ( + AA1C71261F9BC91D00A6BC31 /* bitmath.c */, + AA1C711F1F9BC91C00A6BC31 /* bitreader.c */, + AA1C71231F9BC91C00A6BC31 /* bitwriter.c */, + AA1C71201F9BC91C00A6BC31 /* cpu.c */, + AA1C712A1F9BC91D00A6BC31 /* crc.c */, + AA1C71281F9BC91D00A6BC31 /* fixed_intrin_sse2.c */, + AA1C71321F9BC91E00A6BC31 /* fixed_intrin_ssse3.c */, + AA1C712D1F9BC91E00A6BC31 /* fixed.c */, + AA1C71381F9BC91F00A6BC31 /* float.c */, + AA1C71211F9BC91C00A6BC31 /* format.c */, + AA1C71341F9BC91F00A6BC31 /* lpc_intrin_avx2.c */, + AA1C712B1F9BC91D00A6BC31 /* lpc_intrin_sse.c */, + AA1C71311F9BC91E00A6BC31 /* lpc_intrin_sse2.c */, + AA1C71221F9BC91C00A6BC31 /* lpc_intrin_sse41.c */, + AA1C712F1F9BC91E00A6BC31 /* lpc.c */, + AA1C713C1F9BC92000A6BC31 /* md5.c */, + AA1C713B1F9BC92000A6BC31 /* memory.c */, + AA1C71391F9BC91F00A6BC31 /* metadata_iterators.c */, + AA1C71331F9BC91E00A6BC31 /* metadata_object.c */, + AA1C71371F9BC91F00A6BC31 /* ogg_decoder_aspect.c */, + AA1C71351F9BC91F00A6BC31 /* ogg_encoder_aspect.c */, + AA1C71271F9BC91D00A6BC31 /* ogg_helper.c */, + AA1C713A1F9BC91F00A6BC31 /* ogg_mapping.c */, + AA1C712C1F9BC91D00A6BC31 /* stream_decoder.c */, + AA1C71251F9BC91D00A6BC31 /* stream_encoder_framing.c */, + AA1C71361F9BC91F00A6BC31 /* stream_encoder_intrin_avx2.c */, + AA1C71301F9BC91E00A6BC31 /* stream_encoder_intrin_sse2.c */, + AA1C71241F9BC91D00A6BC31 /* stream_encoder_intrin_ssse3.c */, + AA1C712E1F9BC91E00A6BC31 /* stream_encoder.c */, + AA1C71291F9BC91D00A6BC31 /* window.c */, + ); + name = flac; + path = "../external/flac-1.3.2"; + sourceTree = ""; + }; AA60214C17653A5900662B9C /* modplug */ = { isa = PBXGroup; children = ( @@ -381,6 +494,7 @@ AA60215817653A9800662B9C /* load_mdl.cpp */, AA60215917653A9800662B9C /* load_med.cpp */, AA60215A17653A9800662B9C /* load_mid.cpp */, + AA1C711B1F9BC6AD00A6BC31 /* load_mod.cpp */, AA60215C17653A9800662B9C /* load_mt2.cpp */, AA60215D17653A9800662B9C /* load_mtm.cpp */, AA60215E17653A9800662B9C /* load_okt.cpp */, @@ -490,6 +604,7 @@ AA6442C8175B0E5000A2125A /* registry.h in Headers */, AAE883B61F973261007B6569 /* resample.h in Headers */, AAE4062F1F9609BD00EDAF53 /* music_flac.h in Headers */, + AA1C71191F9BC67200A6BC31 /* effects_internal.h in Headers */, AAE883B31F973261007B6569 /* readmidi.h in Headers */, AA6442CD175B0E5000A2125A /* window_lookup.h in Headers */, AAE883A51F973261007B6569 /* timidity.h in Headers */, @@ -530,7 +645,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0900; }; buildConfigurationList = 00B7E497097EC6B300826121 /* Build configuration list for PBXProject "SDL_mixer" */; compatibilityVersion = "Xcode 3.2"; @@ -568,22 +683,32 @@ buildActionMask = 2147483647; files = ( AAE406321F9609BD00EDAF53 /* music_mad.c in Sources */, + AA1C71451F9BC92000A6BC31 /* ogg_helper.c in Sources */, AAE406351F9609BD00EDAF53 /* music.c in Sources */, AAE883AB1F973261007B6569 /* timidity.c in Sources */, + AA1C71431F9BC92000A6BC31 /* stream_encoder_framing.c in Sources */, AAE4062C1F9609BD00EDAF53 /* music_modplug.c in Sources */, AAE406421F9609BD00EDAF53 /* music_smpeg.c in Sources */, + AA1C713E1F9BC92000A6BC31 /* cpu.c in Sources */, AAE406261F9609BD00EDAF53 /* load_aiff.c in Sources */, + AA1C71471F9BC92000A6BC31 /* window.c in Sources */, + AA1C71421F9BC92000A6BC31 /* stream_encoder_intrin_ssse3.c in Sources */, AA644294175B0E0600A2125A /* bitwise.c in Sources */, AA644295175B0E0600A2125A /* framing.c in Sources */, + AA1C714A1F9BC92000A6BC31 /* stream_decoder.c in Sources */, + AA1C711C1F9BC6AD00A6BC31 /* load_mod.cpp in Sources */, AAE883B71F973261007B6569 /* tables.c in Sources */, AAE406431F9609BD00EDAF53 /* music_cmd.c in Sources */, AA6442A0175B0E2500A2125A /* block.c in Sources */, + AA1C71541F9BC92000A6BC31 /* stream_encoder_intrin_avx2.c in Sources */, AAE883AD1F973261007B6569 /* common.c in Sources */, AA6442A2175B0E2500A2125A /* codebook.c in Sources */, AA6442BB175B0E5000A2125A /* floor0.c in Sources */, AA6442BC175B0E5000A2125A /* floor1.c in Sources */, AA6442BD175B0E5000A2125A /* info.c in Sources */, + AA1C714D1F9BC92000A6BC31 /* lpc.c in Sources */, AA6442C1175B0E5000A2125A /* mapping0.c in Sources */, + AA1C71571F9BC92000A6BC31 /* metadata_iterators.c in Sources */, AA6442C3175B0E5000A2125A /* mdct.c in Sources */, AAE883AC1F973261007B6569 /* instrum.c in Sources */, AA6442C7175B0E5000A2125A /* registry.c in Sources */, @@ -597,44 +722,68 @@ AA60217317653A9800662B9C /* load_669.cpp in Sources */, AA60217417653A9800662B9C /* load_abc.cpp in Sources */, AA60217517653A9800662B9C /* load_amf.cpp in Sources */, + AA1C71501F9BC92000A6BC31 /* fixed_intrin_ssse3.c in Sources */, AA60217617653A9800662B9C /* load_ams.cpp in Sources */, + AA1C714E1F9BC92000A6BC31 /* stream_encoder_intrin_sse2.c in Sources */, + AA1C71461F9BC92000A6BC31 /* fixed_intrin_sse2.c in Sources */, + AA1C711A1F9BC67200A6BC31 /* effects_internal.c in Sources */, AAE4063E1F9609BD00EDAF53 /* music_mikmod.c in Sources */, AA60217717653A9800662B9C /* load_dbm.cpp in Sources */, AAE883A71F973261007B6569 /* resample.c in Sources */, AAE406311F9609BD00EDAF53 /* music_wav.c in Sources */, AA60217817653A9800662B9C /* load_dmf.cpp in Sources */, + AA1C71401F9BC92000A6BC31 /* lpc_intrin_sse41.c in Sources */, + AA1C714F1F9BC92000A6BC31 /* lpc_intrin_sse2.c in Sources */, AA60217917653A9800662B9C /* load_dsm.cpp in Sources */, + AA1C71551F9BC92000A6BC31 /* ogg_decoder_aspect.c in Sources */, AAE406451F9609BD00EDAF53 /* music_mpg123.c in Sources */, AA60217A17653A9800662B9C /* load_far.cpp in Sources */, AA60217B17653A9800662B9C /* load_it.cpp in Sources */, AA60217C17653A9800662B9C /* load_j2b.cpp in Sources */, AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */, + AA1C71411F9BC92000A6BC31 /* bitwriter.c in Sources */, AA60217E17653A9800662B9C /* load_med.cpp in Sources */, AAE406341F9609BD00EDAF53 /* load_voc.c in Sources */, AA60217F17653A9800662B9C /* load_mid.cpp in Sources */, AA60218117653A9800662B9C /* load_mt2.cpp in Sources */, AA60218217653A9800662B9C /* load_mtm.cpp in Sources */, + AA1C713F1F9BC92000A6BC31 /* format.c in Sources */, AAE883B11F973261007B6569 /* playmidi.c in Sources */, AA60218317653A9800662B9C /* load_okt.cpp in Sources */, AA60218417653A9800662B9C /* load_pat.cpp in Sources */, + AA1C713D1F9BC92000A6BC31 /* bitreader.c in Sources */, AAE883B91F973261007B6569 /* mix.c in Sources */, + AA1C714B1F9BC92000A6BC31 /* fixed.c in Sources */, + AA1C71581F9BC92000A6BC31 /* ogg_mapping.c in Sources */, + AA1C71521F9BC92000A6BC31 /* lpc_intrin_avx2.c in Sources */, AAE883B21F973261007B6569 /* readmidi.c in Sources */, AA60218617653A9800662B9C /* load_psm.cpp in Sources */, + AA1C71151F9BC66000A6BC31 /* effect_position.c in Sources */, AA60218717653A9800662B9C /* load_ptm.cpp in Sources */, + AA1C71491F9BC92000A6BC31 /* lpc_intrin_sse.c in Sources */, AAE4062E1F9609BD00EDAF53 /* music_fluidsynth.c in Sources */, + AA1C714C1F9BC92000A6BC31 /* stream_encoder.c in Sources */, + AA1C715A1F9BC92000A6BC31 /* md5.c in Sources */, AA60218817653A9800662B9C /* load_s3m.cpp in Sources */, AA60218917653A9800662B9C /* load_stm.cpp in Sources */, AA60218A17653A9800662B9C /* load_ult.cpp in Sources */, + AA1C71591F9BC92000A6BC31 /* memory.c in Sources */, + AA1C71511F9BC92000A6BC31 /* metadata_object.c in Sources */, AA60218B17653A9800662B9C /* load_umx.cpp in Sources */, AAE4063F1F9609BD00EDAF53 /* music_ogg.c in Sources */, AA60218C17653A9800662B9C /* load_wav.cpp in Sources */, AAE883AF1F973261007B6569 /* output.c in Sources */, + AA1C71441F9BC92000A6BC31 /* bitmath.c in Sources */, AA60218D17653A9800662B9C /* load_xm.cpp in Sources */, AAE4063D1F9609BD00EDAF53 /* music_timidity.c in Sources */, AA60218E17653A9800662B9C /* mmcmp.cpp in Sources */, AAE4063A1F9609BD00EDAF53 /* music_flac.c in Sources */, AA60218F17653A9800662B9C /* modplug.cpp in Sources */, + AA1C71161F9BC66000A6BC31 /* effect_stereoreverse.c in Sources */, + AA1C71561F9BC92000A6BC31 /* float.c in Sources */, + AA1C71531F9BC92000A6BC31 /* ogg_encoder_aspect.c in Sources */, AA60219117653A9800662B9C /* snd_dsp.cpp in Sources */, + AA1C71481F9BC92000A6BC31 /* crc.c in Sources */, AA60219217653A9800662B9C /* snd_flt.cpp in Sources */, AA60219317653A9800662B9C /* snd_fx.cpp in Sources */, AAE406291F9609BD00EDAF53 /* mixer.c in Sources */, @@ -649,7 +798,7 @@ 00B7E490097EC6B300826121 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_STYLE = STATIC; OTHER_CFLAGS = ""; PRODUCT_NAME = SDL2_mixer; @@ -660,7 +809,7 @@ 00B7E491097EC6B300826121 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_STYLE = STATIC; OTHER_CFLAGS = ""; PRODUCT_NAME = SDL2_mixer; @@ -671,26 +820,54 @@ 00B7E498097EC6B300826121 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( MUSIC_WAV, MUSIC_MOD_MODPLUG, "MODPLUG_HEADER=\"\"", - MUSIC_MID, + MUSIC_MID_TIMIDITY, MUSIC_OGG, OGG_USE_TREMOR, "OGG_HEADER=\"\"", + MUSIC_FLAC, + FLAC__HAS_OGG, + HAVE_SYS_PARAM_H, HAVE_STDINT_H, + HAVE_LROUND, HAVE_SETENV, HAVE_SINF, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1)", "$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)", ); HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/../../SDL/include\""; - HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.9.0/src\" \"$(SRCROOT)/../external/libmodplug-0.8.9.0/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.2/include\""; + HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.9.0/src\" \"$(SRCROOT)/../external/libmodplug-0.8.9.0/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.2/include\" \"$(SRCROOT)/../external/flac-1.3.2/include\" \"$(SRCROOT)/../external/flac-1.3.2/src/libFLAC/include\""; IPHONEOS_DEPLOYMENT_TARGET = 3.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -700,26 +877,55 @@ 00B7E499097EC6B300826121 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( MUSIC_WAV, MUSIC_MOD_MODPLUG, "MODPLUG_HEADER=\"\"", - MUSIC_MID, + MUSIC_MID_TIMIDITY, MUSIC_OGG, OGG_USE_TREMOR, "OGG_HEADER=\"\"", + MUSIC_FLAC, + FLAC__HAS_OGG, + HAVE_SYS_PARAM_H, HAVE_STDINT_H, + HAVE_LROUND, HAVE_SETENV, HAVE_SINF, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1)", "$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)", ); HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/../../SDL/include\""; - HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.9.0/src\" \"$(SRCROOT)/../external/libmodplug-0.8.9.0/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.2/include\""; + HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.9.0/src\" \"$(SRCROOT)/../external/libmodplug-0.8.9.0/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.2/include\" \"$(SRCROOT)/../external/flac-1.3.2/include\" \"$(SRCROOT)/../external/flac-1.3.2/src/libFLAC/include\""; IPHONEOS_DEPLOYMENT_TARGET = 3.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; diff --git a/external/flac-1.3.2/src/libFLAC/format.c b/external/flac-1.3.2/src/libFLAC/format.c index 214bd09a..9fe32126 100644 --- a/external/flac-1.3.2/src/libFLAC/format.c +++ b/external/flac-1.3.2/src/libFLAC/format.c @@ -45,6 +45,9 @@ #include "private/macros.h" /* PACKAGE_VERSION should come from configure */ +#ifndef PACKAGE_VERSION +#define PACKAGE_VERSION "UNKNOWN" +#endif FLAC_API const char *FLAC__VERSION_STRING = PACKAGE_VERSION; FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " PACKAGE_VERSION " 20170101";