Revert "update the SDL framework for OS X to hg 5605:9269bf952041 (after 1.2.14)"

This reverts commit f1cf4afa259122c3e2251bf7bce677f9c3ea606e.

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
index aa7d22ff3579c6872149ace2bee4ce0dcdab5311..f7a2e2f8c011c50d3d38285f0117ba3b040300fc 100644 (file)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
@@ -39,10 +39,6 @@
 /*@}*/
 
 #ifndef SDL_BYTEORDER  /* Not defined in SDL_config.h? */
-#ifdef __linux__
-#include <endian.h>
-#define SDL_BYTEORDER  __BYTE_ORDER
-#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -52,7 +48,6 @@
 #else
 #define SDL_BYTEORDER  SDL_LIL_ENDIAN
 #endif
-#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 
@@ -91,7 +86,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
        __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
        return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
 static __inline__ Uint16 SDL_Swap16(Uint16 x)
 {
        __asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
@@ -99,7 +94,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
 }
 #else
 static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-       return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
+       return((x<<8)|(x>>8));
 }
 #endif
 
@@ -126,7 +121,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
        __asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
        return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
 static __inline__ Uint32 SDL_Swap32(Uint32 x)
 {
        __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
@@ -134,7 +129,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
 }
 #else
 static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-       return SDL_static_cast(Uint32, ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24)));
+       return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
 }
 #endif
 
@@ -171,7 +166,7 @@ static __inline__ Uint64 SDL_Swap64(Uint64 x)
        x = SDL_Swap32(lo);
        x <<= 32;
        x |= SDL_Swap32(hi);
-       return (x);
+       return(x);
 }
 #endif
 #else

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
index 1da97fa3b15606b9549167fce6390d9ed5753101..716dddcb73c8736a17527a9fe20b607d02e4815e 100644 (file)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
@@ -203,13 +203,12 @@ typedef struct SDL_SysWMinfo {
 /**
  * This function gives you custom hooks into the window manager information.
  * It fills the structure pointed to by 'info' with custom information and
- * returns 0 if the function is not implemented, 1 if the function is 
- * implemented and no error occurred, and -1 if the version member of
- * the 'info' structure is not filled in or not supported.
+ * returns 1 if the function is implemented.  If it's not implemented, or
+ * the version member of the 'info' structure is invalid, it returns 0. 
  *
  * You typically use this function like this:
  * @code
- * SDL_SysWMinfo info;
+ * SDL_SysWMInfo info;
  * SDL_VERSION(&info.version);
  * if ( SDL_GetWMInfo(&info) ) { ... }
  * @endcode

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
index 2208a88bd216935457d13a65359d2bb874054f52..22748090c5d848e73b5d8af42747d91012d23205 100644 (file)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
@@ -43,7 +43,7 @@
 #ifndef DECLSPEC
 # if defined(__BEOS__) || defined(__HAIKU__)
 #  if defined(__GNUC__)
-#   define DECLSPEC
+#   define DECLSPEC    __declspec(dllexport)
 #  else
 #   define DECLSPEC    __declspec(export)
 #  endif

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
index bb7ba04fe6513b7a8e4f2506843f34dd120c64a6..2a169012f62d36c80b89af9cf896f96a8afe9a5f 100644 (file)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>BuildMachineOSBuild</key>
-       <string>10K549</string>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
@@ -24,19 +22,5 @@
        <string>SDLX</string>
        <key>CFBundleVersion</key>
        <string>1.2.14</string>
-       <key>DTCompiler</key>
-       <string>4.0</string>
-       <key>DTPlatformBuild</key>
-       <string>10M2518</string>
-       <key>DTPlatformVersion</key>
-       <string>PG</string>
-       <key>DTSDKBuild</key>
-       <string>10K549</string>
-       <key>DTSDKName</key>
-       <string></string>
-       <key>DTXcode</key>
-       <string>0400</string>
-       <key>DTXcodeBuild</key>
-       <string>10M2518</string>
 </dict>
 </plist>

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/SDL b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
index 29d8d9056dceee00361d5526af9dd474e6b5dc39..2ccf7d95dbf9dda4681c6866721fd828a9a434d8 100755 (executable)
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/SDL and b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/SDL differ