1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/Xcode/Info-Framework.plist Sat Jun 01 13:59:39 2013 -0700
1.3 @@ -0,0 +1,22 @@
1.4 +<?xml version="1.0" encoding="UTF-8"?>
1.5 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
1.6 +<plist version="1.0">
1.7 +<dict>
1.8 + <key>CFBundleDevelopmentRegion</key>
1.9 + <string>English</string>
1.10 + <key>CFBundleExecutable</key>
1.11 + <string>SDL2_mixer</string>
1.12 + <key>CFBundleIdentifier</key>
1.13 + <string>org.libsdl.SDL2-mixer</string>
1.14 + <key>CFBundleInfoDictionaryVersion</key>
1.15 + <string>6.0</string>
1.16 + <key>CFBundleName</key>
1.17 + <string>SDL2_mixer</string>
1.18 + <key>CFBundlePackageType</key>
1.19 + <string>FMWK</string>
1.20 + <key>CFBundleShortVersionString</key>
1.21 + <string>2.0.0</string>
1.22 + <key>CFBundleVersion</key>
1.23 + <string>2.0.0</string>
1.24 +</dict>
1.25 +</plist>
2.1 --- a/Xcode/Info-Framework__Upgraded_.plist Sat Jun 01 12:47:58 2013 -0700
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,22 +0,0 @@
2.4 -<?xml version="1.0" encoding="UTF-8"?>
2.5 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2.6 -<plist version="1.0">
2.7 -<dict>
2.8 - <key>CFBundleDevelopmentRegion</key>
2.9 - <string>English</string>
2.10 - <key>CFBundleExecutable</key>
2.11 - <string>SDL_mixer</string>
2.12 - <key>CFBundleIdentifier</key>
2.13 - <string>org.libsdl.SDL-mixer</string>
2.14 - <key>CFBundleInfoDictionaryVersion</key>
2.15 - <string>6.0</string>
2.16 - <key>CFBundleName</key>
2.17 - <string>SDL_mixer</string>
2.18 - <key>CFBundlePackageType</key>
2.19 - <string>FMWK</string>
2.20 - <key>CFBundleShortVersionString</key>
2.21 - <string>1.2.13</string>
2.22 - <key>CFBundleVersion</key>
2.23 - <string>1.2.13</string>
2.24 -</dict>
2.25 -</plist>
3.1 --- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj Sat Jun 01 12:47:58 2013 -0700
3.2 +++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj Sat Jun 01 13:59:39 2013 -0700
3.3 @@ -214,7 +214,7 @@
3.4 B2A42D0E03FAC6A400A8000A /* load_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_ogg.c; path = ../load_ogg.c; sourceTree = SOURCE_ROOT; };
3.5 B2A42D0F03FAC6A400A8000A /* load_ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_ogg.h; path = ../load_ogg.h; sourceTree = SOURCE_ROOT; };
3.6 BE1FA8AE07AF95F7004B6283 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
3.7 - BE1FA90507AF96B2004B6283 /* Info-Framework__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework__Upgraded_.plist"; sourceTree = "<group>"; };
3.8 + BE1FA90507AF96B2004B6283 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
3.9 BE1FA90607AF96B2004B6283 /* SDL2_mixer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2_mixer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3.10 BE1FA95407AF96B2004B6283 /* libSDL2_mixer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2_mixer.a; sourceTree = BUILT_PRODUCTS_DIR; };
3.11 BE1FA95807AF96B3004B6283 /* Create DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Create DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
3.12 @@ -282,7 +282,7 @@
3.13 08FB77ACFE841707C02AAC07 /* Library Source */,
3.14 BE1FA8AC07AF95D4004B6283 /* Frameworks */,
3.15 034768DDFF38A45A11DB9C8B /* Products */,
3.16 - BE1FA90507AF96B2004B6283 /* Info-Framework__Upgraded_.plist */,
3.17 + BE1FA90507AF96B2004B6283 /* Info-Framework.plist */,
3.18 );
3.19 name = SDL_mixerFramework;
3.20 sourceTree = "<group>";
3.21 @@ -733,7 +733,7 @@
3.22 buildSettings = {
3.23 DYLIB_COMPATIBILITY_VERSION = 1;
3.24 DYLIB_CURRENT_VERSION = 13;
3.25 - INFOPLIST_FILE = "Info-Framework__Upgraded_.plist";
3.26 + INFOPLIST_FILE = "Info-Framework.plist";
3.27 INSTALL_PATH = "@executable_path/../Frameworks";
3.28 LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
3.29 OTHER_LDFLAGS = (
3.30 @@ -753,7 +753,7 @@
3.31 buildSettings = {
3.32 DYLIB_COMPATIBILITY_VERSION = 1;
3.33 DYLIB_CURRENT_VERSION = 13;
3.34 - INFOPLIST_FILE = "Info-Framework__Upgraded_.plist";
3.35 + INFOPLIST_FILE = "Info-Framework.plist";
3.36 INSTALL_PATH = "@executable_path/../Frameworks";
3.37 LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
3.38 OTHER_LDFLAGS = (
4.1 --- a/gcc-fat.sh Sat Jun 01 12:47:58 2013 -0700
4.2 +++ b/gcc-fat.sh Sat Jun 01 13:59:39 2013 -0700
4.3 @@ -4,29 +4,21 @@
4.4 #
4.5 # Usage: ./configure CC="sh gcc-fat.sh" && make && rm -rf x86 x64
4.6
4.7 -# Intel 32-bit compiler flags (10.4 runtime compatibility)
4.8 -GCC_COMPILE_X86="gcc-4.0 -arch i386 -mmacosx-version-min=10.4 \
4.9 +DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer"
4.10 +
4.11 +# Intel 32-bit compiler flags (10.6 runtime compatibility)
4.12 +GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.6 \
4.13 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
4.14 --nostdinc \
4.15 --F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
4.16 --I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \
4.17 --isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include"
4.18 -
4.19 -GCC_LINK_X86="\
4.20 --L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1 \
4.21 --Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
4.22 +-I/usr/local/include"
4.23
4.24 -# Intel 64-bit compiler flags (10.5 runtime compatibility)
4.25 -GCC_COMPILE_X64="gcc-4.0 -arch x86_64 -mmacosx-version-min=10.5 \
4.26 +GCC_LINK_X86="-mmacosx-version-min=10.6"
4.27 +
4.28 +# Intel 64-bit compiler flags (10.6 runtime compatibility)
4.29 +GCC_COMPILE_X64="gcc -arch x86_64 -mmacosx-version-min=10.6 \
4.30 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \
4.31 --nostdinc \
4.32 --F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
4.33 --I/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \
4.34 --isystem /Developer/SDKs/MacOSX10.5.sdk/usr/include"
4.35 +-I/usr/local/include"
4.36
4.37 -GCC_LINK_X64="\
4.38 --L/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/x86_64 \
4.39 --Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
4.40 +GCC_LINK_X64="-mmacosx-version-min=10.6"
4.41
4.42 # Output both PowerPC and Intel object files
4.43 args="$*"