From 3ffc6e4a3adbbe1853eb06fbf064596c7f0cbce9 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 1 Jun 2013 13:59:39 -0700 Subject: [PATCH] Updated Info.plist for new version --- ...__Upgraded_.plist => Info-Framework.plist} | 10 +++---- Xcode/SDL_mixer.xcodeproj/project.pbxproj | 8 +++--- gcc-fat.sh | 28 +++++++------------ 3 files changed, 19 insertions(+), 27 deletions(-) rename Xcode/{Info-Framework__Upgraded_.plist => Info-Framework.plist} (78%) diff --git a/Xcode/Info-Framework__Upgraded_.plist b/Xcode/Info-Framework.plist similarity index 78% rename from Xcode/Info-Framework__Upgraded_.plist rename to Xcode/Info-Framework.plist index 82aa54cb..cdabf829 100644 --- a/Xcode/Info-Framework__Upgraded_.plist +++ b/Xcode/Info-Framework.plist @@ -5,18 +5,18 @@ CFBundleDevelopmentRegion English CFBundleExecutable - SDL_mixer + SDL2_mixer CFBundleIdentifier - org.libsdl.SDL-mixer + org.libsdl.SDL2-mixer CFBundleInfoDictionaryVersion 6.0 CFBundleName - SDL_mixer + SDL2_mixer CFBundlePackageType FMWK CFBundleShortVersionString - 1.2.13 + 2.0.0 CFBundleVersion - 1.2.13 + 2.0.0 diff --git a/Xcode/SDL_mixer.xcodeproj/project.pbxproj b/Xcode/SDL_mixer.xcodeproj/project.pbxproj index 907b8d7b..0c1eb867 100755 --- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj +++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj @@ -214,7 +214,7 @@ 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 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; - BE1FA90507AF96B2004B6283 /* Info-Framework__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework__Upgraded_.plist"; sourceTree = ""; }; + BE1FA90507AF96B2004B6283 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = ""; }; BE1FA90607AF96B2004B6283 /* SDL2_mixer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2_mixer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BE1FA95407AF96B2004B6283 /* libSDL2_mixer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2_mixer.a; sourceTree = BUILT_PRODUCTS_DIR; }; BE1FA95807AF96B3004B6283 /* Create DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Create DMG"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -282,7 +282,7 @@ 08FB77ACFE841707C02AAC07 /* Library Source */, BE1FA8AC07AF95D4004B6283 /* Frameworks */, 034768DDFF38A45A11DB9C8B /* Products */, - BE1FA90507AF96B2004B6283 /* Info-Framework__Upgraded_.plist */, + BE1FA90507AF96B2004B6283 /* Info-Framework.plist */, ); name = SDL_mixerFramework; sourceTree = ""; @@ -733,7 +733,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 13; - INFOPLIST_FILE = "Info-Framework__Upgraded_.plist"; + INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; OTHER_LDFLAGS = ( @@ -753,7 +753,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 13; - INFOPLIST_FILE = "Info-Framework__Upgraded_.plist"; + INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; OTHER_LDFLAGS = ( diff --git a/gcc-fat.sh b/gcc-fat.sh index 0f61409d..1601c9db 100755 --- a/gcc-fat.sh +++ b/gcc-fat.sh @@ -4,29 +4,21 @@ # # Usage: ./configure CC="sh gcc-fat.sh" && make && rm -rf x86 x64 -# Intel 32-bit compiler flags (10.4 runtime compatibility) -GCC_COMPILE_X86="gcc-4.0 -arch i386 -mmacosx-version-min=10.4 \ +DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer" + +# Intel 32-bit compiler flags (10.6 runtime compatibility) +GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.6 \ -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ --nostdinc \ --F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \ --I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \ --isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include" +-I/usr/local/include" -GCC_LINK_X86="\ --L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1 \ --Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +GCC_LINK_X86="-mmacosx-version-min=10.6" -# Intel 64-bit compiler flags (10.5 runtime compatibility) -GCC_COMPILE_X64="gcc-4.0 -arch x86_64 -mmacosx-version-min=10.5 \ +# Intel 64-bit compiler flags (10.6 runtime compatibility) +GCC_COMPILE_X64="gcc -arch x86_64 -mmacosx-version-min=10.6 \ -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \ --nostdinc \ --F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \ --I/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \ --isystem /Developer/SDKs/MacOSX10.5.sdk/usr/include" +-I/usr/local/include" -GCC_LINK_X64="\ --L/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/x86_64 \ --Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk" +GCC_LINK_X64="-mmacosx-version-min=10.6" # Output both PowerPC and Intel object files args="$*"