diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h index 84be6177..c05712ee 100644 --- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h +++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h @@ -133,6 +133,7 @@ #define SDL_VIDEO_DRIVER_X11_XME 1 #define SDL_VIDEO_DRIVER_X11_XRANDR 1 #define SDL_VIDEO_DRIVER_X11_XV 1 +#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1 /* Enable OpenGL support */ #define SDL_VIDEO_OPENGL 1 diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h index fd9fc867..068da918 100644 --- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h +++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h @@ -86,10 +86,10 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x) #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) static __inline__ Uint16 SDL_Swap16(Uint16 x) { - Uint16 result; + int result; __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x)); - return result; + return (Uint16)result; } #elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) static __inline__ Uint16 SDL_Swap16(Uint16 x) diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist b/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist index 5158033d..95ba0c34 100644 --- a/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist +++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 11C74 + 14A389 CFBundleDevelopmentRegion English CFBundleExecutable @@ -19,24 +19,24 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.2.14 + 1.2.15 CFBundleSignature SDLX CFBundleVersion - 1.2.14 + 1.2.15 DTCompiler - + com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 4D502 + 6E35b DTPlatformVersion GM DTSDKBuild - 11C63 + 14D125 DTSDKName - macosx10.7 + macosx10.10 DTXcode - 0421 + 0640 DTXcodeBuild - 4D502 + 6E35b diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/SDL b/source/xcode/Frameworks/SDL.framework/Versions/A/SDL index 89db482e..66734dc4 100755 Binary files a/source/xcode/Frameworks/SDL.framework/Versions/A/SDL and b/source/xcode/Frameworks/SDL.framework/Versions/A/SDL differ