r2877 - in trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A: . Headers
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Oct 31 08:13:25 EDT 2007
Author: div0
Date: 2007-10-31 08:13:25 -0400 (Wed, 31 Oct 2007)
New Revision: 2877
Modified:
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
Log:
OS X: update to SDL 1.2.12
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -26,14 +26,14 @@
#include "SDL_platform.h"
/* Add any platform that doesn't build using the configure system */
-#if defined(__AMIGA__)
-#include "SDL_config_amiga.h"
-#elif defined(__DREAMCAST__)
+#if defined(__DREAMCAST__)
#include "SDL_config_dreamcast.h"
#elif defined(__MACOS__)
#include "SDL_config_macos.h"
#elif defined(__MACOSX__)
#include "SDL_config_macosx.h"
+#elif defined(__SYMBIAN32__)
+#include "SDL_config_symbian.h" /* must be before win32! */
#elif defined(__WIN32__)
#include "SDL_config_win32.h"
#elif defined(__OS2__)
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -25,6 +25,9 @@
#include "SDL_platform.h"
+/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
+#include <AvailabilityMacros.h>
+
/* This is a set of defines to configure the SDL features */
#define SDL_HAS_64BIT_TYPE 1
@@ -114,7 +117,7 @@
/* Enable various video drivers */
#define SDL_VIDEO_DRIVER_DUMMY 1
-#if TARGET_API_MAC_CARBON
+#if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON))
#define SDL_VIDEO_DRIVER_TOOLBOX 1
#else
#define SDL_VIDEO_DRIVER_QUARTZ 1
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -27,7 +27,7 @@
/* This is a set of defines to configure the SDL features */
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__DMC__)
#define HAVE_STDINT_H 1
#elif defined(_MSC_VER)
typedef signed __int8 int8_t;
@@ -46,6 +46,13 @@
#endif
#define _UINTPTR_T_DEFINED
#endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#endif
+#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#endif
#else /* !__GNUC__ && !_MSC_VER */
typedef signed char int8_t;
typedef unsigned char uint8_t;
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -56,7 +56,7 @@
header should only be included in files that actually use them.
*/
#if defined(__GNUC__) && defined(__i386__) && \
- !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
+ !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
static __inline__ Uint16 SDL_Swap16(Uint16 x)
{
__asm__("xchgb %b0,%h0" : "=q" (x) : "0" (x));
@@ -88,7 +88,8 @@
}
#endif
-#if defined(__GNUC__) && defined(__i386__)
+#if defined(__GNUC__) && defined(__i386__) && \
+ !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
static __inline__ Uint32 SDL_Swap32(Uint32 x)
{
__asm__("bswap %0" : "=r" (x) : "0" (x));
@@ -123,7 +124,8 @@
#endif
#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__)
+#if defined(__GNUC__) && defined(__i386__) && \
+ !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
static __inline__ Uint64 SDL_Swap64(Uint64 x)
{
union {
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -29,10 +29,6 @@
#undef __AIX__
#define __AIX__ 1
#endif
-#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__)
-#undef __AMIGA__
-#define __AMIGA__ 1
-#endif
#if defined(__BEOS__)
#undef __BEOS__
#define __BEOS__ 1
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -62,10 +62,15 @@
Uint32 type;
union {
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__SYMBIAN32__)
struct {
- int append;
- void* h;
+ int append;
+ void *h;
+ struct {
+ void *data;
+ int size;
+ int left;
+ } buffer;
} win32io;
#endif
#ifdef HAVE_STDIO_H
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -91,7 +91,9 @@
#ifdef SDL_HAS_64BIT_TYPE
typedef int64_t Sint64;
+#ifndef SYMBIAN32_GCCE
typedef uint64_t Uint64;
+#endif
#else
/* This is really just a hack to prevent the compiler from complaining */
typedef struct {
@@ -127,7 +129,9 @@
DUMMY_ENUM_VALUE
} SDL_DUMMY_ENUM;
+#ifndef __NDS__
SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
+#endif
#include "begin_code.h"
@@ -181,10 +185,10 @@
# endif
#endif
#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*count)
+#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count))
#define SDL_stack_free(data)
#else
-#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*count)
+#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count))
#define SDL_stack_free(data) SDL_free(data)
#endif
@@ -263,7 +267,10 @@
} while(0)
#endif
-#if defined(__GNUC__) && defined(i386)
+/* We can count on memcpy existing on Mac OS X and being well-tuned. */
+#if defined(__MACH__) && defined(__APPLE__)
+#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
+#elif defined(__GNUC__) && defined(i386)
#define SDL_memcpy(dst, src, len) \
do { \
int u0, u1, u2; \
@@ -292,7 +299,10 @@
#endif
#endif
-#if defined(__GNUC__) && defined(i386)
+/* We can count on memcpy existing on Mac OS X and being well-tuned. */
+#if defined(__MACH__) && defined(__APPLE__)
+#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
+#elif defined(__GNUC__) && defined(i386)
#define SDL_memcpy4(dst, src, len) \
do { \
int ecx, edi, esi; \
@@ -561,19 +571,17 @@
#define SDL_iconv_t iconv_t
#define SDL_iconv_open iconv_open
#define SDL_iconv_close iconv_close
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
#else
typedef struct _SDL_iconv_t *SDL_iconv_t;
extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, const char *fromcode);
extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
#endif
+extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
/* This function converts a string between encodings in one pass, returning a
string that must be freed with SDL_free() or NULL on error.
*/
-extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, char *inbuf, size_t inbytesleft);
-#define SDL_iconv_utf8_ascii(S) SDL_iconv_string("ASCII", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_latin1(S) SDL_iconv_string("LATIN1", "UTF-8", S, SDL_strlen(S)+1)
+extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft);
+#define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
#define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
#define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -86,7 +86,8 @@
Display *display; /* The X11 display */
Window window; /* The X11 display window */
/* These locking functions should be called around
- any X11 functions using the display variable.
+ any X11 functions using the display variable,
+ but not the gfxdisplay variable.
They lock the event thread, so should not be
called around event functions or from event filters.
*/
@@ -96,6 +97,9 @@
/* Introduced in SDL 1.0.2 */
Window fswindow; /* The X11 fullscreen window */
Window wmwindow; /* The X11 managed input window */
+
+ /* Introduced in SDL 1.2.12 */
+ Display *gfxdisplay; /* The X11 display to which rendering is done */
} x11;
} info;
} SDL_SysWMinfo;
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -45,7 +45,7 @@
typedef struct SDL_Thread SDL_Thread;
/* Create a thread */
-#if (defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)
+#if ((defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)) && !defined(__SYMBIAN32__)
/*
We compile SDL into a DLL on OS/2. This means, that it's the DLL which
creates a new thread for the calling process with the SDL_CreateThread()
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -37,7 +37,7 @@
*/
#define SDL_MAJOR_VERSION 1
#define SDL_MINOR_VERSION 2
-#define SDL_PATCHLEVEL 11
+#define SDL_PATCHLEVEL 12
typedef struct SDL_version {
Uint8 major;
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -447,13 +447,15 @@
* Maps an RGB triple to an opaque pixel value for a given pixel format
*/
extern DECLSPEC Uint32 SDLCALL SDL_MapRGB
- (SDL_PixelFormat *format, Uint8 r, Uint8 g, Uint8 b);
+(const SDL_PixelFormat * const format,
+ const Uint8 r, const Uint8 g, const Uint8 b);
/*
* Maps an RGBA quadruple to a pixel value for a given pixel format
*/
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(SDL_PixelFormat *format,
- Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA
+(const SDL_PixelFormat * const format,
+ const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a);
/*
* Maps a pixel value into the RGB components for a given pixel format
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h 2007-10-31 12:02:08 UTC (rev 2876)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h 2007-10-31 12:13:25 UTC (rev 2877)
@@ -83,11 +83,15 @@
#endif
#endif /* SDLCALL */
-/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
#ifdef __SYMBIAN32__
+#ifndef EKA2
#undef DECLSPEC
#define DECLSPEC
-#endif /* __SYMBIAN32__ */
+#elif !defined(__WINS__)
+#undef DECLSPEC
+#define DECLSPEC __declspec(dllexport)
+#endif //EKA2
+#endif //__SYMBIAN32__
/* Force structure packing at 4 byte alignment.
This is necessary if the header is included in code which has structure
@@ -116,14 +120,16 @@
#if defined(_MSC_VER) || defined(__BORLANDC__) || \
defined(__DMC__) || defined(__SC__) || \
defined(__WATCOMC__) || defined(__LCC__) || \
- defined(__DECC)
+ defined(__DECC) || defined(__EABI__)
#ifndef __inline__
#define __inline__ __inline
#endif
#define SDL_INLINE_OKAY
#else
#if !defined(__MRC__) && !defined(_SGI_SOURCE)
+#ifndef __inline__
#define __inline__ inline
+#endif
#define SDL_INLINE_OKAY
#endif /* Not a funky compiler */
#endif /* Visual C++ */
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list