Updated Mac OS X frameworks, and re-added MP3 support to SDL_mixer

libsdl-org · Jun 1, 2013 · 4920a39 · 4920a39
1 parent 3ffc6e4
commit 4920a39
Show file tree

Hide file tree

Showing 23 changed files with 1,029 additions and 864 deletions.
diff --git a/Xcode/Frameworks/FLAC.framework/Versions/A/FLAC b/Xcode/Frameworks/FLAC.framework/Versions/A/FLAC
diff --git a/Xcode/Frameworks/Ogg.framework/Versions/A/Ogg b/Xcode/Frameworks/Ogg.framework/Versions/A/Ogg
diff --git a/Xcode/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>11C74</string>
+	<string>12D78</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -25,19 +25,19 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<string></string>
 	<key>DTPlatformBuild</key>
-	<string>4D502</string>
+	<string>4H1003</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>11C63</string>
+	<string>12D75</string>
 	<key>DTSDKName</key>
-	<string>macosx10.7</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>0421</string>
+	<string>0462</string>
 	<key>DTXcodeBuild</key>
-	<string>4D502</string>
+	<string>4H1003</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Ogg framework 1.1.4, Copyright © 1994-2009 Xiph.Org Foundation</string>
 </dict>

diff --git a/Xcode/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist b/Xcode/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>11C74</string>
+	<string>12D78</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string></string>
 	<key>DTPlatformBuild</key>
-	<string>4D502</string>
+	<string>4H1003</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>11C63</string>
+	<string>12D75</string>
 	<key>DTSDKName</key>
-	<string>macosx10.7</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>0421</string>
+	<string>0462</string>
 	<key>DTXcodeBuild</key>
-	<string>4D502</string>
+	<string>4H1003</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Vorbis framework 1.2.3, Copyright © 1994-2009 Xiph.Org Foundation</string>
 </dict>

diff --git a/Xcode/Frameworks/Vorbis.framework/Versions/A/Vorbis b/Xcode/Frameworks/Vorbis.framework/Versions/A/Vorbis
diff --git a/Xcode/Frameworks/mikmod.framework/Versions/A/Headers/mikmod.h b/Xcode/Frameworks/mikmod.framework/Versions/A/Headers/mikmod.h
@@ -74,7 +74,17 @@ MIKMODAPI extern long MikMod_GetVersion(void);
 #include <windows.h>
 #include <io.h>
 #include <mmsystem.h>
-#endif
+
+/* Avoid conflicts with windef.h */
+#define SBYTE   _mm_SBYTE
+#define UBYTE   _mm_UBYTE
+#define SWORD   _mm_SWORD
+#define UWORD   _mm_UWORD
+#define SLONG   _mm_SLONG
+#define ULONG   _mm_ULONG
+#define BOOL    _mm_BOOL
+
+#endif /* WIN32 */
 
 #if defined(__OS2__)||defined(__EMX__)
 #define INCL_DOSSEMAPHORES
@@ -104,11 +114,9 @@ typedef unsigned char   UBYTE;      /* 1 byte, unsigned */
 typedef signed short    SWORD;      /* 2 bytes, signed */
 typedef unsigned short  UWORD;      /* 2 bytes, unsigned */
 typedef signed long     SLONG;      /* 4 bytes, signed */
-#if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32)
 typedef unsigned long   ULONG;      /* 4 bytes, unsigned */
 typedef int             BOOL;       /* 0=false, <>0 true */
 #endif
-#endif
 
 /*
  *	========== Error codes

diff --git a/Xcode/Frameworks/mikmod.framework/Versions/A/mikmod b/Xcode/Frameworks/mikmod.framework/Versions/A/mikmod
diff --git a/Xcode/Frameworks/smpeg2.framework/Headers b/Xcode/Frameworks/smpeg2.framework/Headers
@@ -0,0 +1 @@
+Versions/Current/Headers