Mercurial > sdl-ios-xcode
changeset 1479:993ef9ff4688
Updated MacOS X support
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 07 Mar 2006 04:58:30 +0000 |
| parents | fc308f08b5f7 |
| children | 0a2bd6507477 |
| files | include/SDL_config_macosx.h include/SDL_platform.h src/loadso/macosx/SDL_sysloadso.c src/video/quartz/SDL_QuartzVideo.h |
| diffstat | 4 files changed, 38 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_config_macosx.h Mon Mar 06 19:20:38 2006 +0000 +++ b/include/SDL_config_macosx.h Tue Mar 07 04:58:30 2006 +0000 @@ -28,11 +28,15 @@ #define SDL_HAS_64BIT_TYPE 1 /* Useful headers */ +#define HAVE_ALLOCA_H 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_STDIO_H 1 #define STDC_HEADERS 1 #define HAVE_STRING_H 1 #define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 /* C library functions */ @@ -43,10 +47,37 @@ #define HAVE_ALLOCA 1 #define HAVE_GETENV 1 #define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 #define HAVE_MEMMOVE 1 #define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 +#define HAVE_STRDUP 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRCASECMP 1 +#define HAVE_SSCANF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_SIGACTION 1 +#define HAVE_SETJMP 1 +#define HAVE_NANOSLEEP 1 /* Enable various audio drivers */ #define SDL_AUDIO_DRIVER_COREAUDIO 1
--- a/include/SDL_platform.h Mon Mar 06 19:20:38 2006 +0000 +++ b/include/SDL_platform.h Tue Mar 07 04:58:30 2006 +0000 @@ -64,11 +64,16 @@ #if defined(macintosh) #undef __MACOS__ #define __MACOS__ 1 +#define TARGET_API_MAC_OS8 1 +#define TARGET_API_MAC_CARBON 0 +#define TARGET_API_MAC_OSX 0 #endif #if defined(__GNUC__) && (defined(__APPLE_CC__) || defined(__APPLE_CPP__)) #undef __MACOSX__ #define __MACOSX__ 1 +#define TARGET_API_MAC_OS8 0 #define TARGET_API_MAC_CARBON 1 +#define TARGET_API_MAC_OSX 1 #endif #if defined(__NetBSD__) #undef __NETBSD__
--- a/src/loadso/macosx/SDL_sysloadso.c Mon Mar 06 19:20:38 2006 +0000 +++ b/src/loadso/macosx/SDL_sysloadso.c Tue Mar 07 04:58:30 2006 +0000 @@ -621,7 +621,7 @@ } /* Up to the caller to SDL_free() returned string */ -static inline char *dyld_error_str() +static inline const char *dyld_error_str() { NSLinkEditErrors dylder; int dylderno;
--- a/src/video/quartz/SDL_QuartzVideo.h Mon Mar 06 19:20:38 2006 +0000 +++ b/src/video/quartz/SDL_QuartzVideo.h Tue Mar 07 04:58:30 2006 +0000 @@ -49,9 +49,6 @@ */ #include <Cocoa/Cocoa.h> -#include <OpenGL/OpenGL.h> -#include <OpenGL/gl.h> -#include <OpenGL/glext.h> #include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> #include <IOKit/IOKitLib.h> /* For powersave handling */ @@ -62,6 +59,7 @@ #include "SDL_error.h" #include "SDL_timer.h" #include "SDL_loadso.h" +#include "SDL_opengl.h" #include "SDL_syswm.h" #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h"