diff include/SDL_config_macosx.h @ 1659:14717b52abc0 SDL-1.3

Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents e49147870aac
children
line wrap: on
line diff
--- a/include/SDL_config_macosx.h	Mon May 01 06:58:33 2006 +0000
+++ b/include/SDL_config_macosx.h	Wed May 17 08:18:28 2006 +0000
@@ -30,7 +30,10 @@
 #define SDL_HAS_64BIT_TYPE	1
 
 /* Useful headers */
+/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
+#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
 #define HAVE_ALLOCA_H		1
+#endif
 #define HAVE_SYS_TYPES_H	1
 #define HAVE_STDIO_H	1
 #define STDC_HEADERS	1
@@ -46,12 +49,7 @@
 #define HAVE_CALLOC	1
 #define HAVE_REALLOC	1
 #define HAVE_FREE	1
-
-/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
-#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
 #define HAVE_ALLOCA	1
-#endif
-
 #define HAVE_GETENV	1
 #define HAVE_PUTENV	1
 #define HAVE_UNSETENV	1
@@ -116,8 +114,11 @@
 
 /* Enable various video drivers */
 #define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_GLSDL	1
+#if TARGET_API_MAC_CARBON
+#define SDL_VIDEO_DRIVER_TOOLBOX	1
+#else
 #define SDL_VIDEO_DRIVER_QUARTZ	1
+#endif
 
 /* Enable OpenGL support */
 #define SDL_VIDEO_OPENGL	1