Updated MacOS Classic MPW build
authorSam Lantinga <slouken@libsdl.org>
Fri, 24 Feb 2006 09:57:14 +0000
changeset 14247a610f25c12f
parent 1423 4ed717f9e509
child 1425 aea151eb97b8
Updated MacOS Classic MPW build
MPWmake.sea.bin
Makefile.in
include/SDL_config.h
include/SDL_config_dreamcast.h
include/SDL_config_macos.h
include/SDL_config_macosx.h
include/SDL_opengl.h
src/endian/.cvsignore
src/main/macos/SDL_main.c
src/main/macos/exports/SDL.x
src/main/macos/exports/gendef.pl
src/video/e_pow.h
src/video/e_sqrt.h
src/video/maccommon/SDL_lowvideo.h
src/video/maccommon/SDL_macevents_c.h
src/video/maccommon/SDL_macgl_c.h
src/video/maccommon/SDL_macmouse_c.h
src/video/maccommon/SDL_macwm_c.h
src/video/macdsp/SDL_dspvideo.c
src/video/macdsp/SDL_dspvideo.h
src/video/macrom/SDL_romvideo.c
src/video/macrom/SDL_romvideo.h
src/video/math_private.h
test/testplatform.c
     1.1 Binary file MPWmake.sea.bin has changed
     2.1 --- a/Makefile.in	Fri Feb 24 08:17:28 2006 +0000
     2.2 +++ b/Makefile.in	Fri Feb 24 09:57:14 2006 +0000
     2.3 @@ -145,3 +145,13 @@
     2.4  
     2.5  rpm: $(distfile)
     2.6  	rpmbuild -ta $?
     2.7 +
     2.8 +# Create a CVS snapshot that people can run update -d on
     2.9 +CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
    2.10 +snapshot:
    2.11 +	cvs -d $(CVSROOT) login
    2.12 +	cvs -d $(CVSROOT) checkout -P SDL12
    2.13 +	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
    2.14 +	mv SDL12 SDL-1.2
    2.15 +	tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
    2.16 +	rm -rf SDL-1.2
     3.1 --- a/include/SDL_config.h	Fri Feb 24 08:17:28 2006 +0000
     3.2 +++ b/include/SDL_config.h	Fri Feb 24 09:57:14 2006 +0000
     3.3 @@ -1,3 +1,4 @@
     3.4 +/* include/SDL_config.h.  Generated by configure.  */
     3.5  /*
     3.6      SDL - Simple DirectMedia Layer
     3.7      Copyright (C) 1997-2006 Sam Lantinga
     3.8 @@ -23,32 +24,269 @@
     3.9  #ifndef _SDL_config_h
    3.10  #define _SDL_config_h
    3.11  
    3.12 +/* This is a set of defines to configure the SDL features */
    3.13 +
    3.14 +/* General platform specific identifiers */
    3.15  #include "SDL_platform.h"
    3.16  
    3.17 -/* Add any platform that doesn't build using the configure system */
    3.18 -#if defined(__AMIGA__)
    3.19 -#include "SDL_config_amiga.h"
    3.20 -#elif defined(__DREAMCAST__)
    3.21 -#include "SDL_config_dreamcast.h"
    3.22 -#elif defined(__MACOS__)
    3.23 -#include "SDL_config_macos.h"
    3.24 -#elif defined(__MACOSX__)
    3.25 -#include "SDL_config_macosx.h"
    3.26 -#elif defined(__WIN32__)
    3.27 -#include "SDL_config_win32.h"
    3.28 +/* C language features */
    3.29 +/* #undef const */
    3.30 +/* #undef inline */
    3.31 +/* #undef volatile */
    3.32 +
    3.33 +/* C datatypes */
    3.34 +/* #undef size_t */
    3.35 +/* #undef int8_t */
    3.36 +/* #undef uint8_t */
    3.37 +/* #undef int16_t */
    3.38 +/* #undef uint16_t */
    3.39 +/* #undef int32_t */
    3.40 +/* #undef uint32_t */
    3.41 +/* #undef int64_t */
    3.42 +/* #undef uint64_t */
    3.43 +/* #undef uintptr_t */
    3.44 +#define SDL_HAS_64BIT_TYPE 1
    3.45 +
    3.46 +/* Endianness */
    3.47 +#define SDL_BYTEORDER 1234
    3.48 +
    3.49 +/* Comment this if you want to build without any C library requirements */
    3.50 +#define HAVE_LIBC 1
    3.51 +#if HAVE_LIBC
    3.52 +
    3.53 +/* Useful headers */
    3.54 +#define HAVE_ALLOCA_H 1
    3.55 +#define HAVE_SYS_TYPES_H 1
    3.56 +#define HAVE_STDIO_H 1
    3.57 +#define STDC_HEADERS 1
    3.58 +#define HAVE_STDLIB_H 1
    3.59 +#define HAVE_STDARG_H 1
    3.60 +#define HAVE_MALLOC_H 1
    3.61 +#define HAVE_MEMORY_H 1
    3.62 +#define HAVE_STRING_H 1
    3.63 +#define HAVE_STRINGS_H 1
    3.64 +#define HAVE_INTTYPES_H 1
    3.65 +#define HAVE_STDINT_H 1
    3.66 +#define HAVE_CTYPE_H 1
    3.67 +#define HAVE_MATH_H 1
    3.68 +#define HAVE_SIGNAL_H 1
    3.69 +/* #undef HAVE_ALTIVEC_H */
    3.70 +
    3.71 +/* C library functions */
    3.72 +#define HAVE_MALLOC 1
    3.73 +#define HAVE_CALLOC 1
    3.74 +#define HAVE_REALLOC 1
    3.75 +#define HAVE_FREE 1
    3.76 +#define HAVE_ALLOCA 1
    3.77 +#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
    3.78 +#define HAVE_GETENV 1
    3.79 +#define HAVE_PUTENV 1
    3.80 +#define HAVE_UNSETENV 1
    3.81 +#endif
    3.82 +#define HAVE_QSORT 1
    3.83 +#define HAVE_ABS 1
    3.84 +#define HAVE_BCOPY 1
    3.85 +#define HAVE_MEMSET 1
    3.86 +#define HAVE_MEMCPY 1
    3.87 +#define HAVE_MEMMOVE 1
    3.88 +#define HAVE_MEMCMP 1
    3.89 +#define HAVE_STRLEN 1
    3.90 +/* #undef HAVE_STRLCPY */
    3.91 +/* #undef HAVE_STRLCAT */
    3.92 +#define HAVE_STRDUP 1
    3.93 +/* #undef HAVE__STRREV */
    3.94 +/* #undef HAVE__STRUPR */
    3.95 +/* #undef HAVE__STRLWR */
    3.96 +/* #undef HAVE_INDEX */
    3.97 +/* #undef HAVE_RINDEX */
    3.98 +#define HAVE_STRCHR 1
    3.99 +#define HAVE_STRRCHR 1
   3.100 +#define HAVE_STRSTR 1
   3.101 +/* #undef HAVE_ITOA */
   3.102 +/* #undef HAVE__LTOA */
   3.103 +/* #undef HAVE__UITOA */
   3.104 +/* #undef HAVE__ULTOA */
   3.105 +#define HAVE_STRTOL 1
   3.106 +/* #undef HAVE__I64TOA */
   3.107 +/* #undef HAVE__UI64TOA */
   3.108 +#define HAVE_STRTOLL 1
   3.109 +#define HAVE_STRTOD 1
   3.110 +#define HAVE_ATOI 1
   3.111 +#define HAVE_ATOF 1
   3.112 +#define HAVE_STRCMP 1
   3.113 +#define HAVE_STRNCMP 1
   3.114 +/* #undef HAVE_STRICMP */
   3.115 +#define HAVE_STRCASECMP 1
   3.116 +#define HAVE_SSCANF 1
   3.117 +#define HAVE_SNPRINTF 1
   3.118 +#define HAVE_VSNPRINTF 1
   3.119 +#define HAVE_SIGACTION 1
   3.120 +#define HAVE_SETJMP 1
   3.121 +#define HAVE_NANOSLEEP 1
   3.122 +/* #undef HAVE_CLOCK_GETTIME */
   3.123 +#define HAVE_DLVSYM 1
   3.124 +
   3.125  #else
   3.126 -/* This is the minimal configuration that can be used to build SDL */
   3.127 +/* We may need some replacement for stdarg.h here */
   3.128 +#include <stdarg.h>
   3.129 +#endif /* HAVE_LIBC */
   3.130  
   3.131 -#include <stdarg.h>
   3.132 +/* Allow disabling of core subsystems */
   3.133 +/* #undef SDL_AUDIO_DISABLED */
   3.134 +/* #undef SDL_CDROM_DISABLED */
   3.135 +/* #undef SDL_CPUINFO_DISABLED */
   3.136 +/* #undef SDL_EVENTS_DISABLED */
   3.137 +/* #undef SDL_FILE_DISABLED */
   3.138 +/* #undef SDL_JOYSTICK_DISABLED */
   3.139 +/* #undef SDL_LOADSO_DISABLED */
   3.140 +/* #undef SDL_THREADS_DISABLED */
   3.141 +/* #undef SDL_TIMERS_DISABLED */
   3.142 +/* #undef SDL_VIDEO_DISABLED */
   3.143  
   3.144 -typedef signed char int8_t;
   3.145 -typedef unsigned char uint8_t;
   3.146 -typedef signed short int16_t;
   3.147 -typedef unsigned short uint16_t;
   3.148 -typedef signed int int32_t;
   3.149 -typedef unsigned int uint32_t;
   3.150 -typedef unsigned int size_t;
   3.151 -typedef unsigned long uintptr_t;
   3.152 -#endif
   3.153 +/* Enable various audio drivers */
   3.154 +/* #undef SDL_AUDIO_DRIVER_AHI */
   3.155 +#define SDL_AUDIO_DRIVER_ALSA 1
   3.156 +#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
   3.157 +#define SDL_AUDIO_DRIVER_ARTS 1
   3.158 +#define SDL_AUDIO_DRIVER_ARTS_DYNAMIC "libartsc.so.0"
   3.159 +/* #undef SDL_AUDIO_DRIVER_BAUDIO */
   3.160 +/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
   3.161 +/* #undef SDL_AUDIO_DRIVER_DART */
   3.162 +/* #undef SDL_AUDIO_DRIVER_DC */
   3.163 +#define SDL_AUDIO_DRIVER_DISK 1
   3.164 +/* #undef SDL_AUDIO_DRIVER_DMEDIA */
   3.165 +/* #undef SDL_AUDIO_DRIVER_DSOUND */
   3.166 +#define SDL_AUDIO_DRIVER_ESD 1
   3.167 +/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
   3.168 +/* #undef SDL_AUDIO_DRIVER_MINT */
   3.169 +/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
   3.170 +#define SDL_AUDIO_DRIVER_NAS 1
   3.171 +/* #undef SDL_AUDIO_DRIVER_OPENBSD */
   3.172 +#define SDL_AUDIO_DRIVER_OSS 1
   3.173 +/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
   3.174 +/* #undef SDL_AUDIO_DRIVER_PAUD */
   3.175 +/* #undef SDL_AUDIO_DRIVER_QNXNTO */
   3.176 +/* #undef SDL_AUDIO_DRIVER_SNDMGR */
   3.177 +/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
   3.178 +/* #undef SDL_AUDIO_DRIVER_WAVEOUT */
   3.179 +
   3.180 +/* Enable various cdrom drivers */
   3.181 +/* #undef SDL_CDROM_AIX */
   3.182 +/* #undef SDL_CDROM_BEOS */
   3.183 +/* #undef SDL_CDROM_BSDI */
   3.184 +/* #undef SDL_CDROM_DC */
   3.185 +/* #undef SDL_CDROM_DUMMY */
   3.186 +/* #undef SDL_CDROM_FREEBSD */
   3.187 +#define SDL_CDROM_LINUX 1
   3.188 +/* #undef SDL_CDROM_MACOS */
   3.189 +/* #undef SDL_CDROM_MACOSX */
   3.190 +/* #undef SDL_CDROM_MINT */
   3.191 +/* #undef SDL_CDROM_OPENBSD */
   3.192 +/* #undef SDL_CDROM_OS2 */
   3.193 +/* #undef SDL_CDROM_OSF */
   3.194 +/* #undef SDL_CDROM_QNX */
   3.195 +/* #undef SDL_CDROM_WIN32 */
   3.196 +
   3.197 +/* Enable various input drivers */
   3.198 +/* #undef SDL_INPUT_TSLIB */
   3.199 +/* #undef SDL_JOYSTICK_AMIGA */
   3.200 +/* #undef SDL_JOYSTICK_BEOS */
   3.201 +/* #undef SDL_JOYSTICK_DC */
   3.202 +/* #undef SDL_JOYSTICK_DUMMY */
   3.203 +/* #undef SDL_JOYSTICK_IOKIT */
   3.204 +#define SDL_JOYSTICK_LINUX 1
   3.205 +/* #undef SDL_JOYSTICK_LINUXEV */
   3.206 +/* #undef SDL_JOYSTICK_MACOS */
   3.207 +/* #undef SDL_JOYSTICK_MINT */
   3.208 +/* #undef SDL_JOYSTICK_OS2 */
   3.209 +/* #undef SDL_JOYSTICK_RISCOS */
   3.210 +/* #undef SDL_JOYSTICK_WINMM */
   3.211 +/* #undef SDL_JOYSTICK_USBHID */
   3.212 +
   3.213 +/* Enable various shared object loading systems */
   3.214 +/* #undef SDL_LOADSO_BEOS */
   3.215 +/* #undef SDL_LOADSO_DLCOMPAT */
   3.216 +#define SDL_LOADSO_DLOPEN 1
   3.217 +/* #undef SDL_LOADSO_LDG */
   3.218 +/* #undef SDL_LOADSO_MACOS */
   3.219 +/* #undef SDL_LOADSO_OS2 */
   3.220 +/* #undef SDL_LOADSO_WIN32 */
   3.221 +
   3.222 +/* Enable various threading systems */
   3.223 +/* #undef SDL_THREAD_AMIGA */
   3.224 +/* #undef SDL_THREAD_BEOS */
   3.225 +/* #undef SDL_THREAD_DC */
   3.226 +/* #undef SDL_THREAD_EPOC */
   3.227 +/* #undef SDL_THREAD_OS2 */
   3.228 +/* #undef SDL_THREAD_PTH */
   3.229 +#define SDL_THREAD_PTHREAD 1
   3.230 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
   3.231 +/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
   3.232 +/* #undef SDL_THREAD_SPROC */
   3.233 +/* #undef SDL_THREAD_WIN32 */
   3.234 +
   3.235 +/* Enable various timer systems */
   3.236 +/* #undef SDL_TIMER_AMIGA */
   3.237 +/* #undef SDL_TIMER_BEOS */
   3.238 +/* #undef SDL_TIMER_DC */
   3.239 +/* #undef SDL_TIMER_EPOC */
   3.240 +/* #undef SDL_TIMER_MACOS */
   3.241 +/* #undef SDL_TIMER_MINT */
   3.242 +/* #undef SDL_TIMER_OS2 */
   3.243 +/* #undef SDL_TIMER_RISCOS */
   3.244 +#define SDL_TIMER_UNIX 1
   3.245 +/* #undef SDL_TIMER_WIN32 */
   3.246 +/* #undef SDL_TIMER_WINCE */
   3.247 +
   3.248 +/* Enable various video drivers */
   3.249 +/* #undef SDL_VIDEO_DRIVER_AALIB */
   3.250 +/* #undef SDL_VIDEO_DRIVER_BWINDOW */
   3.251 +/* #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS */
   3.252 +/* #undef SDL_VIDEO_DRIVER_DC */
   3.253 +/* #undef SDL_VIDEO_DRIVER_DDRAW */
   3.254 +#define SDL_VIDEO_DRIVER_DGA 1
   3.255 +/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
   3.256 +/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */
   3.257 +#define SDL_VIDEO_DRIVER_DUMMY 1
   3.258 +/* #undef SDL_VIDEO_DRIVER_EPOC */
   3.259 +#define SDL_VIDEO_DRIVER_FBCON 1
   3.260 +/* #undef SDL_VIDEO_DRIVER_GAPI */
   3.261 +/* #undef SDL_VIDEO_DRIVER_GEM */
   3.262 +/* #undef SDL_VIDEO_DRIVER_GGI */
   3.263 +/* #undef SDL_VIDEO_DRIVER_IPOD */
   3.264 +/* #undef SDL_VIDEO_DRIVER_NANOX */
   3.265 +/* #undef SDL_VIDEO_DRIVER_OS2FS */
   3.266 +/* #undef SDL_VIDEO_DRIVER_PHOTON */
   3.267 +/* #undef SDL_VIDEO_DRIVER_PICOGUI */
   3.268 +/* #undef SDL_VIDEO_DRIVER_PS2GS */
   3.269 +/* #undef SDL_VIDEO_DRIVER_QTOPIA */
   3.270 +/* #undef SDL_VIDEO_DRIVER_QUARTZ */
   3.271 +/* #undef SDL_VIDEO_DRIVER_RISCOS */
   3.272 +/* #undef SDL_VIDEO_DRIVER_SVGALIB */
   3.273 +/* #undef SDL_VIDEO_DRIVER_TOOLBOX */
   3.274 +/* #undef SDL_VIDEO_DRIVER_VGL */
   3.275 +/* #undef SDL_VIDEO_DRIVER_WINDIB */
   3.276 +/* #undef SDL_VIDEO_DRIVER_WSCONS */
   3.277 +#define SDL_VIDEO_DRIVER_X11 1
   3.278 +#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
   3.279 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
   3.280 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
   3.281 +#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
   3.282 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   3.283 +#define SDL_VIDEO_DRIVER_X11_XME 1
   3.284 +#define SDL_VIDEO_DRIVER_X11_XV 1
   3.285 +/* #undef SDL_VIDEO_DRIVER_XBIOS */
   3.286 +
   3.287 +/* Enable OpenGL support */
   3.288 +#define SDL_VIDEO_OPENGL 1
   3.289 +#define SDL_VIDEO_OPENGL_GLX 1
   3.290 +/* #undef SDL_VIDEO_OPENGL_WGL */
   3.291 +/* #undef SDL_VIDEO_OPENGL_OSMESA */
   3.292 +/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
   3.293 +
   3.294 +/* Enable assembly routines */
   3.295 +#define SDL_ASSEMBLY_ROUTINES 1
   3.296 +/* #undef SDL_HERMES_BLITTERS */
   3.297 +/* #undef SDL_ALTIVEC_BLITTERS */
   3.298  
   3.299  #endif /* _SDL_config_h */
     4.1 --- a/include/SDL_config_dreamcast.h	Fri Feb 24 08:17:28 2006 +0000
     4.2 +++ b/include/SDL_config_dreamcast.h	Fri Feb 24 09:57:14 2006 +0000
     4.3 @@ -41,10 +41,8 @@
     4.4  #define HAVE_REALLOC	1
     4.5  #define HAVE_FREE	1
     4.6  #define HAVE_ALLOCA	1
     4.7 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
     4.8  #define HAVE_GETENV	1
     4.9  #define HAVE_PUTENV	1
    4.10 -#endif
    4.11  #define HAVE_MEMSET	1
    4.12  #define HAVE_MEMCPY	1
    4.13  #define HAVE_MEMMOVE	1
     5.1 --- a/include/SDL_config_macos.h	Fri Feb 24 08:17:28 2006 +0000
     5.2 +++ b/include/SDL_config_macos.h	Fri Feb 24 09:57:14 2006 +0000
     5.3 @@ -25,14 +25,17 @@
     5.4  
     5.5  /* This is a set of defines to configure the SDL features */
     5.6  
     5.7 -#define SDL_HAS_64BIT_TYPE	1
     5.8 +typedef signed char	int8_t;
     5.9 +typedef unsigned char	uint8_t;
    5.10 +typedef signed short	int16_t;
    5.11 +typedef unsigned short	uint16_t;
    5.12 +typedef signed int	int32_t;
    5.13 +typedef unsigned int	uint32_t;
    5.14  
    5.15  /* Useful headers */
    5.16 -#define HAVE_SYS_TYPES_H	1
    5.17  #define HAVE_STDIO_H	1
    5.18  #define STDC_HEADERS	1
    5.19  #define HAVE_STRING_H	1
    5.20 -#define HAVE_INTTYPES_H	1
    5.21  #define HAVE_SIGNAL_H	1
    5.22  
    5.23  /* C library functions */
    5.24 @@ -41,10 +44,6 @@
    5.25  #define HAVE_REALLOC	1
    5.26  #define HAVE_FREE	1
    5.27  #define HAVE_ALLOCA	1
    5.28 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
    5.29 -#define HAVE_GETENV	1
    5.30 -#define HAVE_PUTENV	1
    5.31 -#endif
    5.32  #define HAVE_MEMSET	1
    5.33  #define HAVE_MEMCPY	1
    5.34  #define HAVE_MEMMOVE	1
    5.35 @@ -63,7 +62,7 @@
    5.36  #define SDL_LOADSO_MACOS	1
    5.37  
    5.38  /* Enable various threading systems */
    5.39 -#define SDL_THREAD_DISABLED	1
    5.40 +#define SDL_THREADS_DISABLED	1
    5.41  
    5.42  /* Enable various timer systems */
    5.43  #define SDL_TIMER_MACOS	1
     6.1 --- a/include/SDL_config_macosx.h	Fri Feb 24 08:17:28 2006 +0000
     6.2 +++ b/include/SDL_config_macosx.h	Fri Feb 24 09:57:14 2006 +0000
     6.3 @@ -41,10 +41,8 @@
     6.4  #define HAVE_REALLOC	1
     6.5  #define HAVE_FREE	1
     6.6  #define HAVE_ALLOCA	1
     6.7 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
     6.8  #define HAVE_GETENV	1
     6.9  #define HAVE_PUTENV	1
    6.10 -#endif
    6.11  #define HAVE_MEMSET	1
    6.12  #define HAVE_MEMCPY	1
    6.13  #define HAVE_MEMMOVE	1
     7.1 --- a/include/SDL_opengl.h	Fri Feb 24 08:17:28 2006 +0000
     7.2 +++ b/include/SDL_opengl.h	Fri Feb 24 09:57:14 2006 +0000
     7.3 @@ -34,9 +34,12 @@
     7.4  #ifndef NO_SDL_GLEXT
     7.5  #define __glext_h_  /* Don't let gl.h include glext.h */
     7.6  #endif
     7.7 -#ifdef __MACOSX__
     7.8 +#if defined(__MACOSX__)
     7.9  #include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
    7.10  #include <OpenGL/glu.h>	/* Header File For The GLU Library */
    7.11 +#elif defined(__MACOS__)
    7.12 +#include <gl.h>		/* Header File For The OpenGL Library */
    7.13 +#include <glu.h>	/* Header File For The GLU Library */
    7.14  #else
    7.15  #include <GL/gl.h>	/* Header File For The OpenGL Library */
    7.16  #include <GL/glu.h>	/* Header File For The GLU Library */
     8.1 --- a/src/endian/.cvsignore	Fri Feb 24 08:17:28 2006 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,6 +0,0 @@
     8.4 -Makefile.in
     8.5 -Makefile
     8.6 -.libs
     8.7 -*.o
     8.8 -*.lo
     8.9 -*.la
     9.1 --- a/src/main/macos/SDL_main.c	Fri Feb 24 08:17:28 2006 +0000
     9.2 +++ b/src/main/macos/SDL_main.c	Fri Feb 24 09:57:14 2006 +0000
     9.3 @@ -24,10 +24,6 @@
     9.4     in the MacOS environment. (stdio/stderr is *not* directed for Mach-O builds)
     9.5   */
     9.6  
     9.7 -#include <stdio.h>
     9.8 -#include <stdlib.h>
     9.9 -#include <string.h>
    9.10 -#include <ctype.h>	
    9.11  #if defined(__APPLE__) && defined(__MACH__)
    9.12  #include <Carbon/Carbon.h>
    9.13  #elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335)
    9.14 @@ -89,7 +85,7 @@
    9.15  	argc = 0;
    9.16  	for ( bufp = cmdline; *bufp; ) {
    9.17  		/* Skip leading whitespace */
    9.18 -		while ( isspace(*bufp) ) {
    9.19 +		while ( SDL_isspace(*bufp) ) {
    9.20  			++bufp;
    9.21  		}
    9.22  		/* Skip over argument */
    9.23 @@ -113,7 +109,7 @@
    9.24  				++argc;
    9.25  			}
    9.26  			/* Skip over word */
    9.27 -			while ( *bufp && ! isspace(*bufp) ) {
    9.28 +			while ( *bufp && ! SDL_isspace(*bufp) ) {
    9.29  				++bufp;
    9.30  			}
    9.31  		}
    9.32 @@ -176,7 +172,7 @@
    9.33      if ( noErr != GetProcessInformation (&process, &process_info) )
    9.34         return 0;
    9.35      
    9.36 -    memcpy (name, process_fsp.name, process_fsp.name[0] + 1);
    9.37 +    SDL_memcpy(name, process_fsp.name, process_fsp.name[0] + 1);
    9.38      return 1;
    9.39  }
    9.40  
    9.41 @@ -205,8 +201,8 @@
    9.42      if (app_name[0] > MAX_NAME )
    9.43          app_name[0] = MAX_NAME;
    9.44          
    9.45 -    memcpy (prefs_name + 1, app_name + 1, app_name[0]);    
    9.46 -    memcpy (prefs_name + app_name[0] + 1, SUFFIX, strlen (SUFFIX));
    9.47 +    SDL_memcpy(prefs_name + 1, app_name + 1, app_name[0]);    
    9.48 +    SDL_memcpy(prefs_name + app_name[0] + 1, SUFFIX, strlen (SUFFIX));
    9.49      prefs_name[0] = app_name[0] + strlen (SUFFIX);
    9.50     
    9.51      /* Make the file spec for prefs file */
    9.52 @@ -215,7 +211,7 @@
    9.53              return 0;
    9.54          else {
    9.55              /* Create the prefs file */
    9.56 -            memcpy (prefs_fsp->name, prefs_name, prefs_name[0] + 1);
    9.57 +            SDL_memcpy(prefs_fsp->name, prefs_name, prefs_name[0] + 1);
    9.58              prefs_fsp->parID   = directory_id;
    9.59              prefs_fsp->vRefNum = volume_ref_number;
    9.60                  
    9.61 @@ -241,11 +237,11 @@
    9.62  		HLock(prefs_handle);
    9.63  		
    9.64  		/* Get command line string */	
    9.65 -		memcpy (prefs->command_line, *prefs_handle, (*prefs_handle)[0]+1);
    9.66 +		SDL_memcpy(prefs->command_line, *prefs_handle, (*prefs_handle)[0]+1);
    9.67  
    9.68  		/* Get video driver name */
    9.69  		offset += (*prefs_handle)[0] + 1;	
    9.70 -		memcpy (prefs->video_driver_name, *prefs_handle + offset, (*prefs_handle)[offset] + 1);		
    9.71 +		SDL_memcpy(prefs->video_driver_name, *prefs_handle + offset, (*prefs_handle)[offset] + 1);		
    9.72  		
    9.73  		/* Get save-to-file option (1 or 0) */
    9.74  		offset += (*prefs_handle)[offset] + 1;
    9.75 @@ -278,11 +274,11 @@
    9.76          
    9.77          /* Command line text */
    9.78          offset = 0;
    9.79 -        memcpy (*prefs_handle, prefs->command_line, prefs->command_line[0] + 1);
    9.80 +        SDL_memcpy(*prefs_handle, prefs->command_line, prefs->command_line[0] + 1);
    9.81          
    9.82          /* Video driver name */
    9.83          offset += prefs->command_line[0] + 1;
    9.84 -        memcpy (*prefs_handle + offset, prefs->video_driver_name, prefs->video_driver_name[0] + 1);
    9.85 +        SDL_memcpy(*prefs_handle + offset, prefs->video_driver_name, prefs->video_driver_name[0] + 1);
    9.86          
    9.87          /* Output-to-file option */
    9.88          offset += prefs->video_driver_name[0] + 1;
    9.89 @@ -436,9 +432,9 @@
    9.90  
    9.91  	 if ( readPreferences (&prefs) ) {
    9.92  		
    9.93 -        if (memcmp (prefs.video_driver_name+1, "DSp", 3) == 0)
    9.94 +        if (SDL_memcmp(prefs.video_driver_name+1, "DSp", 3) == 0)
    9.95              videodriver = 1;
    9.96 -        else if (memcmp (prefs.video_driver_name+1, "toolbox", 7) == 0)
    9.97 +        else if (SDL_memcmp(prefs.video_driver_name+1, "toolbox", 7) == 0)
    9.98              videodriver = 2;
    9.99  	 }
   9.100  	 	
   9.101 @@ -540,12 +536,12 @@
   9.102      /* Set pseudo-environment variables for video driver, update prefs */
   9.103  	switch ( videodriver ) {
   9.104  	   case VIDEO_ID_DRAWSPROCKET: 
   9.105 -	      putenv ("SDL_VIDEODRIVER=DSp");
   9.106 -	      memcpy (prefs.video_driver_name, "\pDSp", 4);
   9.107 +	      SDL_putenv("SDL_VIDEODRIVER=DSp");
   9.108 +	      SDL_memcpy(prefs.video_driver_name, "\pDSp", 4);
   9.109  	      break;
   9.110  	   case VIDEO_ID_TOOLBOX:
   9.111 -	      putenv ("SDL_VIDEODRIVER=toolbox");
   9.112 -	      memcpy (prefs.video_driver_name, "\ptoolbox", 8);
   9.113 +	      SDL_putenv("SDL_VIDEODRIVER=toolbox");
   9.114 +	      SDL_memcpy(prefs.video_driver_name, "\ptoolbox", 8);
   9.115  	      break;
   9.116  	}
   9.117  
   9.118 @@ -582,9 +578,9 @@
   9.119          if ( appNameText[i] == ' ' ) appNameText[i] = '_';
   9.120  
   9.121      /* Copy app name & full command text to command-line C-string */      
   9.122 -    memcpy (commandLine, appNameText + 1, appNameText[0]);
   9.123 +    SDL_memcpy(commandLine, appNameText + 1, appNameText[0]);
   9.124      commandLine[appNameText[0]] = ' ';
   9.125 -    memcpy (commandLine + appNameText[0] + 1, prefs.command_line + 1, prefs.command_line[0]);
   9.126 +    SDL_memcpy(commandLine + appNameText[0] + 1, prefs.command_line + 1, prefs.command_line[0]);
   9.127      commandLine[ appNameText[0] + 1 + prefs.command_line[0] ] = '\0';
   9.128  
   9.129      /* Parse C-string into argv and argc */
    10.1 --- a/src/main/macos/exports/SDL.x	Fri Feb 24 08:17:28 2006 +0000
    10.2 +++ b/src/main/macos/exports/SDL.x	Fri Feb 24 09:57:14 2006 +0000
    10.3 @@ -37,18 +37,6 @@
    10.4  	SDL_HasSSE
    10.5  	SDL_HasSSE2
    10.6  	SDL_HasAltiVec
    10.7 -	SDL_ReadLE16
    10.8 -	SDL_ReadBE16
    10.9 -	SDL_ReadLE32
   10.10 -	SDL_ReadBE32
   10.11 -	SDL_ReadLE64
   10.12 -	SDL_ReadBE64
   10.13 -	SDL_WriteLE16
   10.14 -	SDL_WriteBE16
   10.15 -	SDL_WriteLE32
   10.16 -	SDL_WriteBE32
   10.17 -	SDL_WriteLE64
   10.18 -	SDL_WriteBE64
   10.19  	SDL_SetError
   10.20  	SDL_GetError
   10.21  	SDL_ClearError
   10.22 @@ -61,8 +49,6 @@
   10.23  	SDL_SetEventFilter
   10.24  	SDL_GetEventFilter
   10.25  	SDL_EventState
   10.26 -	SDL_putenv
   10.27 -	SDL_getenv
   10.28  	SDL_NumJoysticks
   10.29  	SDL_JoystickName
   10.30  	SDL_JoystickOpen
   10.31 @@ -119,8 +105,21 @@
   10.32  	SDL_RWFromConstMem
   10.33  	SDL_AllocRW
   10.34  	SDL_FreeRW
   10.35 +	SDL_ReadLE16
   10.36 +	SDL_ReadBE16
   10.37 +	SDL_ReadLE32
   10.38 +	SDL_ReadBE32
   10.39 +	SDL_ReadLE64
   10.40 +	SDL_ReadBE64
   10.41 +	SDL_WriteLE16
   10.42 +	SDL_WriteBE16
   10.43 +	SDL_WriteLE32
   10.44 +	SDL_WriteBE32
   10.45 +	SDL_WriteLE64
   10.46 +	SDL_WriteBE64
   10.47  	SDL_GetWMInfo
   10.48  	SDL_CreateThread
   10.49 +	SDL_CreateThread
   10.50  	SDL_ThreadID
   10.51  	SDL_GetThreadID
   10.52  	SDL_WaitThread
   10.53 @@ -188,4 +187,28 @@
   10.54  	SDL_WM_ToggleFullScreen
   10.55  	SDL_WM_GrabInput
   10.56  	SDL_SoftStretch
   10.57 +	SDL_putenv
   10.58 +	SDL_getenv
   10.59 +	SDL_qsort
   10.60 +	SDL_revcpy
   10.61 +	SDL_strlen
   10.62 +	SDL_strlcpy
   10.63 +	SDL_strlcat
   10.64 +	SDL_strdup
   10.65 +	SDL_strrev
   10.66 +	SDL_strupr
   10.67 +	SDL_strlwr
   10.68 +	SDL_strchr
   10.69 +	SDL_strrchr
   10.70 +	SDL_strstr
   10.71 +	SDL_ltoa
   10.72 +	SDL_ultoa
   10.73 +	SDL_strtol
   10.74 +	SDL_strtod
   10.75 +	SDL_strcmp
   10.76 +	SDL_strncmp
   10.77 +	SDL_strcasecmp
   10.78 +	SDL_sscanf
   10.79 +	SDL_snprintf
   10.80 +	SDL_vsnprintf
   10.81  	SDL_InitQuickDraw
    11.1 --- a/src/main/macos/exports/gendef.pl	Fri Feb 24 08:17:28 2006 +0000
    11.2 +++ b/src/main/macos/exports/gendef.pl	Fri Feb 24 09:57:14 2006 +0000
    11.3 @@ -23,4 +23,28 @@
    11.4  }
    11.5  
    11.6  # Special exports to include for this platform
    11.7 +print "\tSDL_putenv\n";
    11.8 +print "\tSDL_getenv\n";
    11.9 +print "\tSDL_qsort\n";
   11.10 +print "\tSDL_revcpy\n";
   11.11 +print "\tSDL_strlen\n";
   11.12 +print "\tSDL_strlcpy\n";
   11.13 +print "\tSDL_strlcat\n";
   11.14 +print "\tSDL_strdup\n";
   11.15 +print "\tSDL_strrev\n";
   11.16 +print "\tSDL_strupr\n";
   11.17 +print "\tSDL_strlwr\n";
   11.18 +print "\tSDL_strchr\n";
   11.19 +print "\tSDL_strrchr\n";
   11.20 +print "\tSDL_strstr\n";
   11.21 +print "\tSDL_ltoa\n";
   11.22 +print "\tSDL_ultoa\n";
   11.23 +print "\tSDL_strtol\n";
   11.24 +print "\tSDL_strtod\n";
   11.25 +print "\tSDL_strcmp\n";
   11.26 +print "\tSDL_strncmp\n";
   11.27 +print "\tSDL_strcasecmp\n";
   11.28 +print "\tSDL_sscanf\n";
   11.29 +print "\tSDL_snprintf\n";
   11.30 +print "\tSDL_vsnprintf\n";
   11.31  print "\tSDL_InitQuickDraw\n";
    12.1 --- a/src/video/e_pow.h	Fri Feb 24 08:17:28 2006 +0000
    12.2 +++ b/src/video/e_pow.h	Fri Feb 24 09:57:14 2006 +0000
    12.3 @@ -296,7 +296,7 @@
    12.4  	z  = one-(r-z);
    12.5  	GET_HIGH_WORD(j,z);
    12.6  	j += (n<<20);
    12.7 -	if((j>>20)<=0) z = scalbn(z,n);	/* subnormal output */
    12.8 +	if((j>>20)<=0) z = SDL_NAME(scalbn)(z,n);	/* subnormal output */
    12.9  	else SET_HIGH_WORD(z,j);
   12.10  	return s*z;
   12.11  }
    13.1 --- a/src/video/e_sqrt.h	Fri Feb 24 08:17:28 2006 +0000
    13.2 +++ b/src/video/e_sqrt.h	Fri Feb 24 09:57:14 2006 +0000
    13.3 @@ -88,9 +88,9 @@
    13.4  #include "math_private.h"
    13.5  
    13.6  #ifdef __STDC__
    13.7 -	double copysign(double x, double y)
    13.8 +	double SDL_NAME(copysign)(double x, double y)
    13.9  #else
   13.10 -	double copysign(x,y)
   13.11 +	double SDL_NAME(copysign)(x,y)
   13.12  	double x,y;
   13.13  #endif
   13.14  {
   13.15 @@ -102,9 +102,9 @@
   13.16  }
   13.17  
   13.18  #ifdef __STDC__
   13.19 -	double scalbn (double x, int n)
   13.20 +	double SDL_NAME(scalbn) (double x, int n)
   13.21  #else
   13.22 -	double scalbn (x,n)
   13.23 +	double SDL_NAME(scalbn) (x,n)
   13.24  	double x; int n;
   13.25  #endif
   13.26  {
   13.27 @@ -120,13 +120,13 @@
   13.28  	    }
   13.29          if (k==0x7ff) return x+x;		/* NaN or Inf */
   13.30          k = k+n;
   13.31 -        if (k >  0x7fe) return huge*copysign(huge,x); /* overflow  */
   13.32 +        if (k >  0x7fe) return huge*SDL_NAME(copysign)(huge,x); /* overflow  */
   13.33          if (k > 0) 				/* normal result */
   13.34  	    {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
   13.35          if (k <= -54) {
   13.36              if (n > 50000) 	/* in case integer overflow in n+k */
   13.37 -		return huge*copysign(huge,x);	/*overflow*/
   13.38 -	    else return tiny*copysign(tiny,x); 	/*underflow*/
   13.39 +		return huge*SDL_NAME(copysign)(huge,x);	/*overflow*/
   13.40 +	    else return tiny*SDL_NAME(copysign)(tiny,x); 	/*underflow*/
   13.41  	}
   13.42          k += 54;				/* subnormal result */
   13.43  	SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
    14.1 --- a/src/video/maccommon/SDL_lowvideo.h	Fri Feb 24 08:17:28 2006 +0000
    14.2 +++ b/src/video/maccommon/SDL_lowvideo.h	Fri Feb 24 09:57:14 2006 +0000
    14.3 @@ -36,7 +36,13 @@
    14.4  #endif
    14.5  
    14.6  #if SDL_VIDEO_OPENGL
    14.7 -#include "SDL_opengl.h"
    14.8 +#ifdef MACOSX
    14.9 +#include <OpenGL/gl.h> /* OpenGL.framework */
   14.10 +#include <AGL/agl.h>   /* AGL.framework */
   14.11 +#else
   14.12 +#include <gl.h>
   14.13 +#include <agl.h>
   14.14 +#endif /* MACOSX */
   14.15  #endif
   14.16  
   14.17  #include "SDL_video.h"
    15.1 --- a/src/video/maccommon/SDL_macevents_c.h	Fri Feb 24 08:17:28 2006 +0000
    15.2 +++ b/src/video/maccommon/SDL_macevents_c.h	Fri Feb 24 09:57:14 2006 +0000
    15.3 @@ -21,7 +21,7 @@
    15.4  */
    15.5  #include "SDL_config.h"
    15.6  
    15.7 -#include "SDL_romvideo.h"
    15.8 +#include "../macrom/SDL_romvideo.h"
    15.9  
   15.10  /* Functions exported by SDL_macevents.c for the video subsystem
   15.11  */
    16.1 --- a/src/video/maccommon/SDL_macgl_c.h	Fri Feb 24 08:17:28 2006 +0000
    16.2 +++ b/src/video/maccommon/SDL_macgl_c.h	Fri Feb 24 09:57:14 2006 +0000
    16.3 @@ -25,7 +25,13 @@
    16.4  #include "SDL_config.h"
    16.5  
    16.6  #if SDL_VIDEO_OPENGL
    16.7 -#include "SDL_opengl.h"
    16.8 +#ifdef MACOSX
    16.9 +#include <OpenGL/gl.h> /* OpenGL.framework */
   16.10 +#include <AGL/agl.h>   /* AGL.framework */
   16.11 +#else
   16.12 +#include <gl.h>
   16.13 +#include <agl.h>
   16.14 +#endif /* MACOSX */
   16.15  #endif
   16.16  
   16.17  /* OpenGL functions */
    17.1 --- a/src/video/maccommon/SDL_macmouse_c.h	Fri Feb 24 08:17:28 2006 +0000
    17.2 +++ b/src/video/maccommon/SDL_macmouse_c.h	Fri Feb 24 09:57:14 2006 +0000
    17.3 @@ -21,7 +21,7 @@
    17.4  */
    17.5  #include "SDL_config.h"
    17.6  
    17.7 -#include "SDL_romvideo.h"
    17.8 +#include "../macrom/SDL_romvideo.h"
    17.9  
   17.10  /* Functions to be exported */
   17.11  extern void Mac_FreeWMCursor(_THIS, WMcursor *cursor);
    18.1 --- a/src/video/maccommon/SDL_macwm_c.h	Fri Feb 24 08:17:28 2006 +0000
    18.2 +++ b/src/video/maccommon/SDL_macwm_c.h	Fri Feb 24 09:57:14 2006 +0000
    18.3 @@ -21,7 +21,7 @@
    18.4  */
    18.5  #include "SDL_config.h"
    18.6  
    18.7 -#include "SDL_romvideo.h"
    18.8 +#include "../macrom/SDL_romvideo.h"
    18.9  
   18.10  /* Functions to be exported */
   18.11  extern void Mac_SetCaption(_THIS, const char *title, const char *icon);
    19.1 --- a/src/video/macdsp/SDL_dspvideo.c	Fri Feb 24 08:17:28 2006 +0000
    19.2 +++ b/src/video/macdsp/SDL_dspvideo.c	Fri Feb 24 09:57:14 2006 +0000
    19.3 @@ -144,10 +144,10 @@
    19.4  #include "../SDL_blit.h"
    19.5  #include "../SDL_pixels_c.h"
    19.6  #include "SDL_dspvideo.h"
    19.7 -#include "SDL_macgl_c.h"
    19.8 -#include "SDL_macwm_c.h"
    19.9 -#include "SDL_macmouse_c.h"
   19.10 -#include "SDL_macevents_c.h"
   19.11 +#include "../maccommon/SDL_macgl_c.h"
   19.12 +#include "../maccommon/SDL_macwm_c.h"
   19.13 +#include "../maccommon/SDL_macmouse_c.h"
   19.14 +#include "../maccommon/SDL_macevents_c.h"
   19.15  
   19.16  /* Initialization/Query functions */
   19.17  static int DSp_VideoInit(_THIS, SDL_PixelFormat *vformat);
    20.1 --- a/src/video/macdsp/SDL_dspvideo.h	Fri Feb 24 08:17:28 2006 +0000
    20.2 +++ b/src/video/macdsp/SDL_dspvideo.h	Fri Feb 24 09:57:14 2006 +0000
    20.3 @@ -30,7 +30,7 @@
    20.4  #include <DrawSprocket.h>
    20.5  #endif
    20.6  
    20.7 -#include "SDL_lowvideo.h"
    20.8 +#include "../maccommon/SDL_lowvideo.h"
    20.9  
   20.10  /* DrawSprocket specific information */
   20.11  struct DSpInfo {
    21.1 --- a/src/video/macrom/SDL_romvideo.c	Fri Feb 24 08:17:28 2006 +0000
    21.2 +++ b/src/video/macrom/SDL_romvideo.c	Fri Feb 24 09:57:14 2006 +0000
    21.3 @@ -46,10 +46,10 @@
    21.4  #include "SDL_syswm.h"
    21.5  #include "../SDL_sysvideo.h"
    21.6  #include "SDL_romvideo.h"
    21.7 -#include "SDL_macgl_c.h"
    21.8 -#include "SDL_macwm_c.h"
    21.9 -#include "SDL_macmouse_c.h"
   21.10 -#include "SDL_macevents_c.h"
   21.11 +#include "../maccommon/SDL_macgl_c.h"
   21.12 +#include "../maccommon/SDL_macwm_c.h"
   21.13 +#include "../maccommon/SDL_macmouse_c.h"
   21.14 +#include "../maccommon/SDL_macevents_c.h"
   21.15  
   21.16  /* Initialization/Query functions */
   21.17  static int ROM_VideoInit(_THIS, SDL_PixelFormat *vformat);
    22.1 --- a/src/video/macrom/SDL_romvideo.h	Fri Feb 24 08:17:28 2006 +0000
    22.2 +++ b/src/video/macrom/SDL_romvideo.h	Fri Feb 24 09:57:14 2006 +0000
    22.3 @@ -24,6 +24,6 @@
    22.4  #ifndef _SDL_romvideo_h
    22.5  #define _SDL_romvideo_h
    22.6  
    22.7 -#include "SDL_lowvideo.h"
    22.8 +#include "../maccommon/SDL_lowvideo.h"
    22.9  
   22.10  #endif /* _SDL_romvideo_h */
    23.1 --- a/src/video/math_private.h	Fri Feb 24 08:17:28 2006 +0000
    23.2 +++ b/src/video/math_private.h	Fri Feb 24 09:57:14 2006 +0000
    23.3 @@ -17,6 +17,7 @@
    23.4  #ifndef _MATH_PRIVATE_H_
    23.5  #define _MATH_PRIVATE_H_
    23.6  
    23.7 +#include "SDL_name.h"
    23.8  #include "SDL_endian.h"
    23.9  
   23.10  #define huge		really_big /* huge is a reserved keyword in VC++ 6.0 */
    24.1 --- a/test/testplatform.c	Fri Feb 24 08:17:28 2006 +0000
    24.2 +++ b/test/testplatform.c	Fri Feb 24 09:57:14 2006 +0000
    24.3 @@ -78,7 +78,7 @@
    24.4  		printf("Detected a %s endian machine.\n",
    24.5  			(SDL_BYTEORDER == SDL_LIL_ENDIAN) ? "little" : "big");
    24.6  	}
    24.7 -	if ( *((char *)&value) == '1' ) {
    24.8 +	if ( (*((char *)&value) >> 4) == 0x1 ) {
    24.9  		real_byteorder = SDL_BIG_ENDIAN;
   24.10  	} else {
   24.11  		real_byteorder = SDL_LIL_ENDIAN;