From 1b141bf30930a86880ea287a194c949a03da4ab9 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 9 Jan 2012 01:58:40 -0500 Subject: [PATCH] Moved external frameworks to the "Frameworks" directory for consistency --- .../{flac => Frameworks}/FLAC.framework/FLAC | 0 .../FLAC.framework/Headers | 0 .../FLAC.framework/LICENSE.FLAC.txt | 0 .../FLAC.framework/Resources | 0 .../FLAC.framework/Versions/A/FLAC | Bin .../Versions/A/Headers/FLAC/all.h | 0 .../Versions/A/Headers/FLAC/assert.h | 0 .../Versions/A/Headers/FLAC/callback.h | 0 .../Versions/A/Headers/FLAC/export.h | 0 .../Versions/A/Headers/FLAC/format.h | 0 .../Versions/A/Headers/FLAC/metadata.h | 0 .../Versions/A/Headers/FLAC/ordinals.h | 0 .../Versions/A/Headers/FLAC/stream_decoder.h | 0 .../Versions/A/Headers/FLAC/stream_encoder.h | 0 .../Resources/English.lproj/InfoPlist.strings | Bin .../Versions/A/Resources/Info.plist | 0 .../FLAC.framework/Versions/Current | 0 .../Ogg.framework}/Headers | 0 .../Ogg.framework/LICENSE.ogg-vorbis.txt | 0 .../{vorbis => Frameworks}/Ogg.framework/Ogg | 0 .../Ogg.framework}/Resources | 0 .../Ogg.framework/Versions/A/Headers/ogg.h | 0 .../Versions/A/Headers/os_types.h | 0 .../Ogg.framework/Versions/A/Ogg | Bin .../Resources/English.lproj/InfoPlist.strings | Bin .../Versions/A/Resources/Info.plist | 0 .../Ogg.framework}/Versions/Current | 0 .../Vorbis.framework}/Headers | 0 .../Vorbis.framework/LICENSE.ogg-vorbis.txt | 0 .../Vorbis.framework}/Resources | 0 .../Versions/A/Headers/codec.h | 0 .../Versions/A/Headers/vorbisenc.h | 0 .../Versions/A/Headers/vorbisfile.h | 0 .../Resources/English.lproj/InfoPlist.strings | Bin .../Versions/A/Resources/Info.plist | 0 .../Vorbis.framework/Versions/A/Vorbis | Bin .../Vorbis.framework}/Versions/Current | 0 .../Vorbis.framework/Vorbis | 0 .../mikmod.framework}/Headers | 0 .../mikmod.framework/LICENSE.mikmod.txt | 0 .../mikmod.framework}/Resources | 0 .../Versions/A/Headers/mikmod.h | 0 .../Resources/English.lproj/InfoPlist.strings | Bin .../Versions/A/Resources/Info.plist | 0 .../mikmod.framework/Versions/A/mikmod | Bin .../mikmod.framework}/Versions/Current | 0 .../mikmod.framework/mikmod | 0 .../smpeg.framework}/Headers | 0 .../smpeg.framework/LICENSE.smpeg.txt | 0 .../smpeg.framework}/Resources | 0 .../smpeg.framework/Versions/A/Headers/MPEG.h | 0 .../Versions/A/Headers/MPEGaction.h | 0 .../Versions/A/Headers/MPEGaudio.h | 0 .../Versions/A/Headers/MPEGerror.h | 0 .../Versions/A/Headers/MPEGfilter.h | 0 .../Versions/A/Headers/MPEGlist.h | 0 .../Versions/A/Headers/MPEGring.h | 0 .../Versions/A/Headers/MPEGstream.h | 0 .../Versions/A/Headers/MPEGsystem.h | 0 .../Versions/A/Headers/MPEGvideo.h | 0 .../Versions/A/Headers/smpeg.h | 0 .../Versions/A/Resources/Info.plist | 0 .../smpeg.framework/Versions/A/smpeg | Bin .../smpeg.framework}/Versions/Current | 0 .../smpeg.framework/smpeg | 0 Xcode/SDL_mixer.xcodeproj/project.pbxproj | 18 +++++++++--------- 66 files changed, 9 insertions(+), 9 deletions(-) rename Xcode/{flac => Frameworks}/FLAC.framework/FLAC (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Headers (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/LICENSE.FLAC.txt (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Resources (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/FLAC (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/all.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/assert.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/callback.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/export.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/format.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/metadata.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/ordinals.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/stream_decoder.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Headers/FLAC/stream_encoder.h (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Resources/English.lproj/InfoPlist.strings (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/A/Resources/Info.plist (100%) rename Xcode/{flac => Frameworks}/FLAC.framework/Versions/Current (100%) rename Xcode/{mikmod/mikmod.framework => Frameworks/Ogg.framework}/Headers (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/LICENSE.ogg-vorbis.txt (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/Ogg (100%) rename Xcode/{mikmod/mikmod.framework => Frameworks/Ogg.framework}/Resources (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/Versions/A/Headers/ogg.h (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/Versions/A/Headers/os_types.h (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/Versions/A/Ogg (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings (100%) rename Xcode/{vorbis => Frameworks}/Ogg.framework/Versions/A/Resources/Info.plist (100%) rename Xcode/{mikmod/mikmod.framework => Frameworks/Ogg.framework}/Versions/Current (100%) rename Xcode/{smpeg/smpeg.framework => Frameworks/Vorbis.framework}/Headers (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/LICENSE.ogg-vorbis.txt (100%) rename Xcode/{smpeg/smpeg.framework => Frameworks/Vorbis.framework}/Resources (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Versions/A/Headers/codec.h (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Versions/A/Headers/vorbisenc.h (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Versions/A/Headers/vorbisfile.h (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Versions/A/Resources/Info.plist (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Versions/A/Vorbis (100%) rename Xcode/{smpeg/smpeg.framework => Frameworks/Vorbis.framework}/Versions/Current (100%) rename Xcode/{vorbis => Frameworks}/Vorbis.framework/Vorbis (100%) rename Xcode/{vorbis/Ogg.framework => Frameworks/mikmod.framework}/Headers (100%) rename Xcode/{mikmod => Frameworks}/mikmod.framework/LICENSE.mikmod.txt (100%) rename Xcode/{vorbis/Ogg.framework => Frameworks/mikmod.framework}/Resources (100%) rename Xcode/{mikmod => Frameworks}/mikmod.framework/Versions/A/Headers/mikmod.h (100%) rename Xcode/{mikmod => Frameworks}/mikmod.framework/Versions/A/Resources/English.lproj/InfoPlist.strings (100%) rename Xcode/{mikmod => Frameworks}/mikmod.framework/Versions/A/Resources/Info.plist (100%) rename Xcode/{mikmod => Frameworks}/mikmod.framework/Versions/A/mikmod (100%) rename Xcode/{vorbis/Ogg.framework => Frameworks/mikmod.framework}/Versions/Current (100%) rename Xcode/{mikmod => Frameworks}/mikmod.framework/mikmod (100%) rename Xcode/{vorbis/Vorbis.framework => Frameworks/smpeg.framework}/Headers (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/LICENSE.smpeg.txt (100%) rename Xcode/{vorbis/Vorbis.framework => Frameworks/smpeg.framework}/Resources (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEG.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGaction.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGaudio.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGerror.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGfilter.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGlist.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGring.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGstream.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGsystem.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/MPEGvideo.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Headers/smpeg.h (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/Resources/Info.plist (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/Versions/A/smpeg (100%) rename Xcode/{vorbis/Vorbis.framework => Frameworks/smpeg.framework}/Versions/Current (100%) rename Xcode/{smpeg => Frameworks}/smpeg.framework/smpeg (100%) diff --git a/Xcode/flac/FLAC.framework/FLAC b/Xcode/Frameworks/FLAC.framework/FLAC similarity index 100% rename from Xcode/flac/FLAC.framework/FLAC rename to Xcode/Frameworks/FLAC.framework/FLAC diff --git a/Xcode/flac/FLAC.framework/Headers b/Xcode/Frameworks/FLAC.framework/Headers similarity index 100% rename from Xcode/flac/FLAC.framework/Headers rename to Xcode/Frameworks/FLAC.framework/Headers diff --git a/Xcode/flac/FLAC.framework/LICENSE.FLAC.txt b/Xcode/Frameworks/FLAC.framework/LICENSE.FLAC.txt similarity index 100% rename from Xcode/flac/FLAC.framework/LICENSE.FLAC.txt rename to Xcode/Frameworks/FLAC.framework/LICENSE.FLAC.txt diff --git a/Xcode/flac/FLAC.framework/Resources b/Xcode/Frameworks/FLAC.framework/Resources similarity index 100% rename from Xcode/flac/FLAC.framework/Resources rename to Xcode/Frameworks/FLAC.framework/Resources diff --git a/Xcode/flac/FLAC.framework/Versions/A/FLAC b/Xcode/Frameworks/FLAC.framework/Versions/A/FLAC similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/FLAC rename to Xcode/Frameworks/FLAC.framework/Versions/A/FLAC diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/all.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/all.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/all.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/all.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/assert.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/assert.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/assert.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/assert.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/callback.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/callback.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/callback.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/callback.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/export.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/export.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/export.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/export.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/format.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/format.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/format.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/format.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/metadata.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/metadata.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/metadata.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/metadata.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/ordinals.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/ordinals.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/ordinals.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/ordinals.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/stream_decoder.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/stream_decoder.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/stream_decoder.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/stream_decoder.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/stream_encoder.h b/Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/stream_encoder.h similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Headers/FLAC/stream_encoder.h rename to Xcode/Frameworks/FLAC.framework/Versions/A/Headers/FLAC/stream_encoder.h diff --git a/Xcode/flac/FLAC.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Xcode/Frameworks/FLAC.framework/Versions/A/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Resources/English.lproj/InfoPlist.strings rename to Xcode/Frameworks/FLAC.framework/Versions/A/Resources/English.lproj/InfoPlist.strings diff --git a/Xcode/flac/FLAC.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/A/Resources/Info.plist rename to Xcode/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist diff --git a/Xcode/flac/FLAC.framework/Versions/Current b/Xcode/Frameworks/FLAC.framework/Versions/Current similarity index 100% rename from Xcode/flac/FLAC.framework/Versions/Current rename to Xcode/Frameworks/FLAC.framework/Versions/Current diff --git a/Xcode/mikmod/mikmod.framework/Headers b/Xcode/Frameworks/Ogg.framework/Headers similarity index 100% rename from Xcode/mikmod/mikmod.framework/Headers rename to Xcode/Frameworks/Ogg.framework/Headers diff --git a/Xcode/vorbis/Ogg.framework/LICENSE.ogg-vorbis.txt b/Xcode/Frameworks/Ogg.framework/LICENSE.ogg-vorbis.txt similarity index 100% rename from Xcode/vorbis/Ogg.framework/LICENSE.ogg-vorbis.txt rename to Xcode/Frameworks/Ogg.framework/LICENSE.ogg-vorbis.txt diff --git a/Xcode/vorbis/Ogg.framework/Ogg b/Xcode/Frameworks/Ogg.framework/Ogg similarity index 100% rename from Xcode/vorbis/Ogg.framework/Ogg rename to Xcode/Frameworks/Ogg.framework/Ogg diff --git a/Xcode/mikmod/mikmod.framework/Resources b/Xcode/Frameworks/Ogg.framework/Resources similarity index 100% rename from Xcode/mikmod/mikmod.framework/Resources rename to Xcode/Frameworks/Ogg.framework/Resources diff --git a/Xcode/vorbis/Ogg.framework/Versions/A/Headers/ogg.h b/Xcode/Frameworks/Ogg.framework/Versions/A/Headers/ogg.h similarity index 100% rename from Xcode/vorbis/Ogg.framework/Versions/A/Headers/ogg.h rename to Xcode/Frameworks/Ogg.framework/Versions/A/Headers/ogg.h diff --git a/Xcode/vorbis/Ogg.framework/Versions/A/Headers/os_types.h b/Xcode/Frameworks/Ogg.framework/Versions/A/Headers/os_types.h similarity index 100% rename from Xcode/vorbis/Ogg.framework/Versions/A/Headers/os_types.h rename to Xcode/Frameworks/Ogg.framework/Versions/A/Headers/os_types.h diff --git a/Xcode/vorbis/Ogg.framework/Versions/A/Ogg b/Xcode/Frameworks/Ogg.framework/Versions/A/Ogg similarity index 100% rename from Xcode/vorbis/Ogg.framework/Versions/A/Ogg rename to Xcode/Frameworks/Ogg.framework/Versions/A/Ogg diff --git a/Xcode/vorbis/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Xcode/Frameworks/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from Xcode/vorbis/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings rename to Xcode/Frameworks/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings diff --git a/Xcode/vorbis/Ogg.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Xcode/vorbis/Ogg.framework/Versions/A/Resources/Info.plist rename to Xcode/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist diff --git a/Xcode/mikmod/mikmod.framework/Versions/Current b/Xcode/Frameworks/Ogg.framework/Versions/Current similarity index 100% rename from Xcode/mikmod/mikmod.framework/Versions/Current rename to Xcode/Frameworks/Ogg.framework/Versions/Current diff --git a/Xcode/smpeg/smpeg.framework/Headers b/Xcode/Frameworks/Vorbis.framework/Headers similarity index 100% rename from Xcode/smpeg/smpeg.framework/Headers rename to Xcode/Frameworks/Vorbis.framework/Headers diff --git a/Xcode/vorbis/Vorbis.framework/LICENSE.ogg-vorbis.txt b/Xcode/Frameworks/Vorbis.framework/LICENSE.ogg-vorbis.txt similarity index 100% rename from Xcode/vorbis/Vorbis.framework/LICENSE.ogg-vorbis.txt rename to Xcode/Frameworks/Vorbis.framework/LICENSE.ogg-vorbis.txt diff --git a/Xcode/smpeg/smpeg.framework/Resources b/Xcode/Frameworks/Vorbis.framework/Resources similarity index 100% rename from Xcode/smpeg/smpeg.framework/Resources rename to Xcode/Frameworks/Vorbis.framework/Resources diff --git a/Xcode/vorbis/Vorbis.framework/Versions/A/Headers/codec.h b/Xcode/Frameworks/Vorbis.framework/Versions/A/Headers/codec.h similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/A/Headers/codec.h rename to Xcode/Frameworks/Vorbis.framework/Versions/A/Headers/codec.h diff --git a/Xcode/vorbis/Vorbis.framework/Versions/A/Headers/vorbisenc.h b/Xcode/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisenc.h similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/A/Headers/vorbisenc.h rename to Xcode/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisenc.h diff --git a/Xcode/vorbis/Vorbis.framework/Versions/A/Headers/vorbisfile.h b/Xcode/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisfile.h similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/A/Headers/vorbisfile.h rename to Xcode/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisfile.h diff --git a/Xcode/vorbis/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Xcode/Frameworks/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings rename to Xcode/Frameworks/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings diff --git a/Xcode/vorbis/Vorbis.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/A/Resources/Info.plist rename to Xcode/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist diff --git a/Xcode/vorbis/Vorbis.framework/Versions/A/Vorbis b/Xcode/Frameworks/Vorbis.framework/Versions/A/Vorbis similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/A/Vorbis rename to Xcode/Frameworks/Vorbis.framework/Versions/A/Vorbis diff --git a/Xcode/smpeg/smpeg.framework/Versions/Current b/Xcode/Frameworks/Vorbis.framework/Versions/Current similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/Current rename to Xcode/Frameworks/Vorbis.framework/Versions/Current diff --git a/Xcode/vorbis/Vorbis.framework/Vorbis b/Xcode/Frameworks/Vorbis.framework/Vorbis similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Vorbis rename to Xcode/Frameworks/Vorbis.framework/Vorbis diff --git a/Xcode/vorbis/Ogg.framework/Headers b/Xcode/Frameworks/mikmod.framework/Headers similarity index 100% rename from Xcode/vorbis/Ogg.framework/Headers rename to Xcode/Frameworks/mikmod.framework/Headers diff --git a/Xcode/mikmod/mikmod.framework/LICENSE.mikmod.txt b/Xcode/Frameworks/mikmod.framework/LICENSE.mikmod.txt similarity index 100% rename from Xcode/mikmod/mikmod.framework/LICENSE.mikmod.txt rename to Xcode/Frameworks/mikmod.framework/LICENSE.mikmod.txt diff --git a/Xcode/vorbis/Ogg.framework/Resources b/Xcode/Frameworks/mikmod.framework/Resources similarity index 100% rename from Xcode/vorbis/Ogg.framework/Resources rename to Xcode/Frameworks/mikmod.framework/Resources diff --git a/Xcode/mikmod/mikmod.framework/Versions/A/Headers/mikmod.h b/Xcode/Frameworks/mikmod.framework/Versions/A/Headers/mikmod.h similarity index 100% rename from Xcode/mikmod/mikmod.framework/Versions/A/Headers/mikmod.h rename to Xcode/Frameworks/mikmod.framework/Versions/A/Headers/mikmod.h diff --git a/Xcode/mikmod/mikmod.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Xcode/Frameworks/mikmod.framework/Versions/A/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from Xcode/mikmod/mikmod.framework/Versions/A/Resources/English.lproj/InfoPlist.strings rename to Xcode/Frameworks/mikmod.framework/Versions/A/Resources/English.lproj/InfoPlist.strings diff --git a/Xcode/mikmod/mikmod.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/mikmod.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Xcode/mikmod/mikmod.framework/Versions/A/Resources/Info.plist rename to Xcode/Frameworks/mikmod.framework/Versions/A/Resources/Info.plist diff --git a/Xcode/mikmod/mikmod.framework/Versions/A/mikmod b/Xcode/Frameworks/mikmod.framework/Versions/A/mikmod similarity index 100% rename from Xcode/mikmod/mikmod.framework/Versions/A/mikmod rename to Xcode/Frameworks/mikmod.framework/Versions/A/mikmod diff --git a/Xcode/vorbis/Ogg.framework/Versions/Current b/Xcode/Frameworks/mikmod.framework/Versions/Current similarity index 100% rename from Xcode/vorbis/Ogg.framework/Versions/Current rename to Xcode/Frameworks/mikmod.framework/Versions/Current diff --git a/Xcode/mikmod/mikmod.framework/mikmod b/Xcode/Frameworks/mikmod.framework/mikmod similarity index 100% rename from Xcode/mikmod/mikmod.framework/mikmod rename to Xcode/Frameworks/mikmod.framework/mikmod diff --git a/Xcode/vorbis/Vorbis.framework/Headers b/Xcode/Frameworks/smpeg.framework/Headers similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Headers rename to Xcode/Frameworks/smpeg.framework/Headers diff --git a/Xcode/smpeg/smpeg.framework/LICENSE.smpeg.txt b/Xcode/Frameworks/smpeg.framework/LICENSE.smpeg.txt similarity index 100% rename from Xcode/smpeg/smpeg.framework/LICENSE.smpeg.txt rename to Xcode/Frameworks/smpeg.framework/LICENSE.smpeg.txt diff --git a/Xcode/vorbis/Vorbis.framework/Resources b/Xcode/Frameworks/smpeg.framework/Resources similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Resources rename to Xcode/Frameworks/smpeg.framework/Resources diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEG.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEG.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEG.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEG.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGaction.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGaction.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGaction.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGaction.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGaudio.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGaudio.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGaudio.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGaudio.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGerror.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGerror.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGerror.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGerror.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGfilter.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGfilter.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGfilter.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGfilter.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGlist.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGlist.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGlist.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGlist.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGring.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGring.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGring.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGring.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGstream.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGstream.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGstream.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGstream.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGsystem.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGsystem.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGsystem.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGsystem.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGvideo.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGvideo.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/MPEGvideo.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/MPEGvideo.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Headers/smpeg.h b/Xcode/Frameworks/smpeg.framework/Versions/A/Headers/smpeg.h similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Headers/smpeg.h rename to Xcode/Frameworks/smpeg.framework/Versions/A/Headers/smpeg.h diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/smpeg.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/Resources/Info.plist rename to Xcode/Frameworks/smpeg.framework/Versions/A/Resources/Info.plist diff --git a/Xcode/smpeg/smpeg.framework/Versions/A/smpeg b/Xcode/Frameworks/smpeg.framework/Versions/A/smpeg similarity index 100% rename from Xcode/smpeg/smpeg.framework/Versions/A/smpeg rename to Xcode/Frameworks/smpeg.framework/Versions/A/smpeg diff --git a/Xcode/vorbis/Vorbis.framework/Versions/Current b/Xcode/Frameworks/smpeg.framework/Versions/Current similarity index 100% rename from Xcode/vorbis/Vorbis.framework/Versions/Current rename to Xcode/Frameworks/smpeg.framework/Versions/Current diff --git a/Xcode/smpeg/smpeg.framework/smpeg b/Xcode/Frameworks/smpeg.framework/smpeg similarity index 100% rename from Xcode/smpeg/smpeg.framework/smpeg rename to Xcode/Frameworks/smpeg.framework/smpeg diff --git a/Xcode/SDL_mixer.xcodeproj/project.pbxproj b/Xcode/SDL_mixer.xcodeproj/project.pbxproj index 68fa557e..c3ddfda7 100755 --- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj +++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj @@ -160,7 +160,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 00938E1B108A36520009CF19 /* mikmod.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mikmod.framework; path = mikmod/mikmod.framework; sourceTree = ""; }; + 00938E1B108A36520009CF19 /* mikmod.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mikmod.framework; path = Frameworks/mikmod.framework; sourceTree = ""; }; 00938E2B108A37800009CF19 /* load_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_flac.c; path = ../load_flac.c; sourceTree = SOURCE_ROOT; }; 00938E2C108A37800009CF19 /* load_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_flac.h; path = ../load_flac.h; sourceTree = SOURCE_ROOT; }; 00938E2D108A37800009CF19 /* music_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_flac.c; path = ../music_flac.c; sourceTree = SOURCE_ROOT; }; @@ -174,7 +174,7 @@ 00938E4B108A397A0009CF19 /* dynamic_mod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mod.c; path = ../dynamic_mod.c; sourceTree = SOURCE_ROOT; }; 00938E4C108A397A0009CF19 /* dynamic_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mp3.h; path = ../dynamic_mp3.h; sourceTree = SOURCE_ROOT; }; 00938E4D108A397A0009CF19 /* dynamic_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_ogg.h; path = ../dynamic_ogg.h; sourceTree = SOURCE_ROOT; }; - 00939014108A5C470009CF19 /* smpeg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = smpeg.framework; path = smpeg/smpeg.framework; sourceTree = ""; }; + 00939014108A5C470009CF19 /* smpeg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = smpeg.framework; path = Frameworks/smpeg.framework; sourceTree = ""; }; 0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = native_midi_macosx.c; sourceTree = ""; }; 04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_mp3.c; path = ../dynamic_mp3.c; sourceTree = SOURCE_ROOT; }; 04A8FCA90A19CB070046373F /* dynamic_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_ogg.c; path = ../dynamic_ogg.c; sourceTree = SOURCE_ROOT; }; @@ -212,9 +212,9 @@ 5CC1B898012FB8CD7F000001 /* timidity.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timidity.h; sourceTree = ""; }; 5CC1B89B012FB8CD7F000001 /* wavestream.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = wavestream.c; path = ../wavestream.c; sourceTree = ""; }; 5CC1B89C012FB8CD7F000001 /* wavestream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = wavestream.h; path = ../wavestream.h; sourceTree = ""; }; - AA9F7DB314B15ADC00278D1E /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = vorbis/Ogg.framework; sourceTree = ""; }; - AA9F7DB414B15ADC00278D1E /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = vorbis/Vorbis.framework; sourceTree = ""; }; - AA9F7DB714B15AE700278D1E /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = flac/FLAC.framework; sourceTree = ""; }; + AA9F7DB314B15ADC00278D1E /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = Frameworks/Ogg.framework; sourceTree = ""; }; + AA9F7DB414B15ADC00278D1E /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = Frameworks/Vorbis.framework; sourceTree = ""; }; + AA9F7DB714B15AE700278D1E /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = Frameworks/FLAC.framework; sourceTree = ""; }; B2A42D0E03FAC6A400A8000A /* load_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_ogg.c; path = ../load_ogg.c; sourceTree = SOURCE_ROOT; }; B2A42D0F03FAC6A400A8000A /* load_ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_ogg.h; path = ../load_ogg.h; sourceTree = SOURCE_ROOT; }; BE1FA8AE07AF95F7004B6283 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; @@ -848,7 +848,7 @@ "$(HOME)/Library/Frameworks", /Library/Frameworks, ); - FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/mikmod\" \"$(SRCROOT)/smpeg\" \"$(SRCROOT)/vorbis\" \"$(SRCROOT)/flac\""; + FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( CMD_MUSIC, @@ -866,7 +866,7 @@ "$(HOME)/Library/Frameworks/SDL.framework/Headers", /Library/Frameworks/SDL.framework/Headers, ); - HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/mikmod/mikmod.framework/Headers\" \"$(SRCROOT)/smpeg/smpeg.framework/Headers\" \"$(SRCROOT)/vorbis/Ogg.framework/Headers\" \"$(SRCROOT)/vorbis/Vorbis.framework/Headers\" \"$(SRCROOT)/flac/FLAC.framework/Headers\""; + HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/mikmod.framework/Headers\" \"$(SRCROOT)/Frameworks/smpeg.framework/Headers\" \"$(SRCROOT)/Frameworks/Ogg.framework/Headers\" \"$(SRCROOT)/Frameworks/Vorbis.framework/Headers\" \"$(SRCROOT)/Frameworks/FLAC.framework/Headers\""; MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = SDL_mixer; SDKROOT = macosx; @@ -884,7 +884,7 @@ "$(HOME)/Library/Frameworks", /Library/Frameworks, ); - FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/mikmod\" \"$(SRCROOT)/smpeg\" \"$(SRCROOT)/vorbis\" \"$(SRCROOT)/flac\""; + FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( CMD_MUSIC, @@ -902,7 +902,7 @@ "$(HOME)/Library/Frameworks/SDL.framework/Headers", /Library/Frameworks/SDL.framework/Headers, ); - HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/mikmod/mikmod.framework/Headers\" \"$(SRCROOT)/smpeg/smpeg.framework/Headers\" \"$(SRCROOT)/vorbis/Ogg.framework/Headers\" \"$(SRCROOT)/vorbis/Vorbis.framework/Headers\" \"$(SRCROOT)/flac/FLAC.framework/Headers\""; + HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/mikmod.framework/Headers\" \"$(SRCROOT)/Frameworks/smpeg.framework/Headers\" \"$(SRCROOT)/Frameworks/Ogg.framework/Headers\" \"$(SRCROOT)/Frameworks/Vorbis.framework/Headers\" \"$(SRCROOT)/Frameworks/FLAC.framework/Headers\""; MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = SDL_mixer; SDKROOT = macosx;