From 8e8a8d88dfb03b9fae137f48cfca71cd88d8da50 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 24 Feb 2006 09:57:14 +0000 Subject: [PATCH] Updated MacOS Classic MPW build --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401428 --- MPWmake.sea.bin | Bin 31360 -> 31232 bytes Makefile.in | 10 + include/SDL_config.h | 282 ++++++++++++++++++++++++-- include/SDL_config_dreamcast.h | 2 - include/SDL_config_macos.h | 15 +- include/SDL_config_macosx.h | 2 - include/SDL_opengl.h | 5 +- src/endian/.cvsignore | 6 - src/main/macos/SDL_main.c | 40 ++-- src/main/macos/exports/SDL.x | 51 +++-- src/main/macos/exports/gendef.pl | 24 +++ src/video/e_pow.h | 2 +- src/video/e_sqrt.h | 14 +- src/video/maccommon/SDL_lowvideo.h | 8 +- src/video/maccommon/SDL_macevents_c.h | 2 +- src/video/maccommon/SDL_macgl_c.h | 8 +- src/video/maccommon/SDL_macmouse_c.h | 2 +- src/video/maccommon/SDL_macwm_c.h | 2 +- src/video/macdsp/SDL_dspvideo.c | 8 +- src/video/macdsp/SDL_dspvideo.h | 2 +- src/video/macrom/SDL_romvideo.c | 8 +- src/video/macrom/SDL_romvideo.h | 2 +- src/video/math_private.h | 1 + test/testplatform.c | 2 +- 24 files changed, 397 insertions(+), 101 deletions(-) delete mode 100644 src/endian/.cvsignore diff --git a/MPWmake.sea.bin b/MPWmake.sea.bin index ebcb8c0bc32499f7cce96b05e04ca57f75f49711..8ef31229fa60b60bbe07b2e1c5b89c094e8d76ff 100644 GIT binary patch delta 3155 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 delta 3338 zcmZvec{r498^-S$jIFWnBimR8$t2s%i^!HGWnW5VeXWJTAQ@Ze)fC27B>NH(6VYZy zO4f+H!ZG6hfx}vos7l?i4aF5o$Kb{Z^-RQ}KrAnSiJTei60ABTpl}J2|1c3fWT$jRKpi zqwxC;MY9ChA#}h=L~yg)vJYbp@9-_H1R2zP<+z&Qse|9`)`AcQV(#JL_lea$;q7+W zJ9p1UPCmZ7B=_~3igj5mtt!{%ELljp`24H}*x(Z=v7I=17x&(-yhV8^lNjyG9&wX) z)VKJu?#ptlKVO|{^R0#M|0D&!T+3@}u^5cG>~eFOFyGo_PzRh&(`jyu+J*UKCu>J? z4MzER;J8VbWR>l3`DmRR-i`d)*2ebc=#=*T{9$!$nR}PQcyzna{O{aI-cPbw?JA0Yt{nVYKit?AGYB$nvq)}SO7mF{n z8y8@|`+s^cL3&m;k@VyadRplmB=!)ARc~qf)9q-d<(4>ci+Q7YtIu?{zx7di)RyC) z>mHXpypx%8+f($#d8Z2}9r1onud1BS)HhEQp7SIeM&`eVT2c2m6UhPj)@`NuH}3gl zm#@brWb9;W4Ysfi48?}Yo=?0@FyZlGqLQF?_5$=d#nE5hSFK5Q8!+w{E&oJq$}+b(t+ z?j*7Or1kfBxMm4<4!daMQd{2N8+4Oul<>@@76=v9t=e*t($lK{YD&0Pa8EyhfVK*6 z@#DAJFFfyVrFA7`pWOq;N9lenkb)=pp)SJpIgPQ2^$eS!y0#HTnum~7#%h<&+MqFF zQO!C>3w=`I-XKIZus}!~WYmX6*Ns;_+1R|)--Fam-APk-8;RVhfN;;LYnj}77Kw?& z*9AYEyF9G9px)^Wf3gYrx!oYD7`B3|L zvBL*7uW=eXBo$$^LTDYMXB=a{jGk^VxNUf?wqw{!FaF$p3Wuey4MEbBY&`Ikkzy<2 z_vUI@iMRLNDecg~eLR}|t;p?!KO_i!v6r6r!!LC`Ol@JAYp>Ugl55NFwR9WqaA61k zk;D~P+HKpqBH`=Le@t-CwDKgv-(6hS$5L+Tj0`sRb4~rBcg>C`-wJbb3YRS2CxKib zeHWLH6r%g;>jX)xyqMZRE4r8)d&!$}j4Le`hD_2BY}TW(u6^+uJcwM8%vr*llB0TIHX@#I@eMq)7>F zW2HuY-=4?DP{XMd_DAIF_v0+e7Ej??bb2Vcx!ng_Sw337ds(WaF9!9 zKAM(m}yKipJCL?G+p$eXW888)b9BtzEDnea5zu64=&szD8$d>-}8%b!arH!S8=`sK-hZsnUpOiOi~j- zKbXWSaLj z@SF`2`=C@+rhcry-c0IwOTVNOys?-rKBK^1f)-Aly_i|__pk;w0YF+}_v`-$LsGGrJXAl8xsXP2QK;0f6iaE|iz7M#kaJ<~kbyuz zRX#Bh_Wg8-F7K`vTu7LI_%ADacWB_Zx7n@_g{;g$F;a}2Bs5xvd7F}v%MjFFRwZOF zE9U|LsxNa;oYbsBv zMfCxoZpb{o+5rSKPm2_<{+XMQe)=M1$rE`(jS*2Kk!W2MY>a5VD*!-; wwku$n+ZF5n%JEFGt`lsG=s=2$4i|xq5s$$_!Y%}dgmZMt;39l|{i6W*FSGccL;wH) diff --git a/Makefile.in b/Makefile.in index ece42304b..b5224d509 100644 --- a/Makefile.in +++ b/Makefile.in @@ -145,3 +145,13 @@ dist $(distfile): rpm: $(distfile) rpmbuild -ta $? + +# Create a CVS snapshot that people can run update -d on +CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs +snapshot: + cvs -d $(CVSROOT) login + cvs -d $(CVSROOT) checkout -P SDL12 + (cd SDL12 && ./autogen.sh && rm -rf autom4te.cache) + mv SDL12 SDL-1.2 + tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2 + rm -rf SDL-1.2 diff --git a/include/SDL_config.h b/include/SDL_config.h index 0c177fd41..324ad585d 100644 --- a/include/SDL_config.h +++ b/include/SDL_config.h @@ -1,3 +1,4 @@ +/* include/SDL_config.h. Generated by configure. */ /* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga @@ -23,32 +24,269 @@ #ifndef _SDL_config_h #define _SDL_config_h +/* This is a set of defines to configure the SDL features */ + +/* General platform specific identifiers */ #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__) -#include "SDL_config_dreamcast.h" -#elif defined(__MACOS__) -#include "SDL_config_macos.h" -#elif defined(__MACOSX__) -#include "SDL_config_macosx.h" -#elif defined(__WIN32__) -#include "SDL_config_win32.h" -#else -/* This is the minimal configuration that can be used to build SDL */ +/* C language features */ +/* #undef const */ +/* #undef inline */ +/* #undef volatile */ -#include +/* C datatypes */ +/* #undef size_t */ +/* #undef int8_t */ +/* #undef uint8_t */ +/* #undef int16_t */ +/* #undef uint16_t */ +/* #undef int32_t */ +/* #undef uint32_t */ +/* #undef int64_t */ +/* #undef uint64_t */ +/* #undef uintptr_t */ +#define SDL_HAS_64BIT_TYPE 1 -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef unsigned int size_t; -typedef unsigned long uintptr_t; +/* Endianness */ +#define SDL_BYTEORDER 1234 + +/* Comment this if you want to build without any C library requirements */ +#define HAVE_LIBC 1 +#if HAVE_LIBC + +/* Useful headers */ +#define HAVE_ALLOCA_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_MALLOC_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRING_H 1 +#define HAVE_STRINGS_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 +/* #undef HAVE_ALTIVEC_H */ + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 #endif +#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 +/* #undef HAVE_STRLCPY */ +/* #undef HAVE_STRLCAT */ +#define HAVE_STRDUP 1 +/* #undef HAVE__STRREV */ +/* #undef HAVE__STRUPR */ +/* #undef HAVE__STRLWR */ +/* #undef HAVE_INDEX */ +/* #undef HAVE_RINDEX */ +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +/* #undef HAVE_ITOA */ +/* #undef HAVE__LTOA */ +/* #undef HAVE__UITOA */ +/* #undef HAVE__ULTOA */ +#define HAVE_STRTOL 1 +/* #undef HAVE__I64TOA */ +/* #undef HAVE__UI64TOA */ +#define HAVE_STRTOLL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +/* #undef HAVE_STRICMP */ +#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 +/* #undef HAVE_CLOCK_GETTIME */ +#define HAVE_DLVSYM 1 + +#else +/* We may need some replacement for stdarg.h here */ +#include +#endif /* HAVE_LIBC */ + +/* Allow disabling of core subsystems */ +/* #undef SDL_AUDIO_DISABLED */ +/* #undef SDL_CDROM_DISABLED */ +/* #undef SDL_CPUINFO_DISABLED */ +/* #undef SDL_EVENTS_DISABLED */ +/* #undef SDL_FILE_DISABLED */ +/* #undef SDL_JOYSTICK_DISABLED */ +/* #undef SDL_LOADSO_DISABLED */ +/* #undef SDL_THREADS_DISABLED */ +/* #undef SDL_TIMERS_DISABLED */ +/* #undef SDL_VIDEO_DISABLED */ + +/* Enable various audio drivers */ +/* #undef SDL_AUDIO_DRIVER_AHI */ +#define SDL_AUDIO_DRIVER_ALSA 1 +#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2" +#define SDL_AUDIO_DRIVER_ARTS 1 +#define SDL_AUDIO_DRIVER_ARTS_DYNAMIC "libartsc.so.0" +/* #undef SDL_AUDIO_DRIVER_BAUDIO */ +/* #undef SDL_AUDIO_DRIVER_COREAUDIO */ +/* #undef SDL_AUDIO_DRIVER_DART */ +/* #undef SDL_AUDIO_DRIVER_DC */ +#define SDL_AUDIO_DRIVER_DISK 1 +/* #undef SDL_AUDIO_DRIVER_DMEDIA */ +/* #undef SDL_AUDIO_DRIVER_DSOUND */ +#define SDL_AUDIO_DRIVER_ESD 1 +/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */ +/* #undef SDL_AUDIO_DRIVER_MINT */ +/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */ +#define SDL_AUDIO_DRIVER_NAS 1 +/* #undef SDL_AUDIO_DRIVER_OPENBSD */ +#define SDL_AUDIO_DRIVER_OSS 1 +/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */ +/* #undef SDL_AUDIO_DRIVER_PAUD */ +/* #undef SDL_AUDIO_DRIVER_QNXNTO */ +/* #undef SDL_AUDIO_DRIVER_SNDMGR */ +/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */ +/* #undef SDL_AUDIO_DRIVER_WAVEOUT */ + +/* Enable various cdrom drivers */ +/* #undef SDL_CDROM_AIX */ +/* #undef SDL_CDROM_BEOS */ +/* #undef SDL_CDROM_BSDI */ +/* #undef SDL_CDROM_DC */ +/* #undef SDL_CDROM_DUMMY */ +/* #undef SDL_CDROM_FREEBSD */ +#define SDL_CDROM_LINUX 1 +/* #undef SDL_CDROM_MACOS */ +/* #undef SDL_CDROM_MACOSX */ +/* #undef SDL_CDROM_MINT */ +/* #undef SDL_CDROM_OPENBSD */ +/* #undef SDL_CDROM_OS2 */ +/* #undef SDL_CDROM_OSF */ +/* #undef SDL_CDROM_QNX */ +/* #undef SDL_CDROM_WIN32 */ + +/* Enable various input drivers */ +/* #undef SDL_INPUT_TSLIB */ +/* #undef SDL_JOYSTICK_AMIGA */ +/* #undef SDL_JOYSTICK_BEOS */ +/* #undef SDL_JOYSTICK_DC */ +/* #undef SDL_JOYSTICK_DUMMY */ +/* #undef SDL_JOYSTICK_IOKIT */ +#define SDL_JOYSTICK_LINUX 1 +/* #undef SDL_JOYSTICK_LINUXEV */ +/* #undef SDL_JOYSTICK_MACOS */ +/* #undef SDL_JOYSTICK_MINT */ +/* #undef SDL_JOYSTICK_OS2 */ +/* #undef SDL_JOYSTICK_RISCOS */ +/* #undef SDL_JOYSTICK_WINMM */ +/* #undef SDL_JOYSTICK_USBHID */ + +/* Enable various shared object loading systems */ +/* #undef SDL_LOADSO_BEOS */ +/* #undef SDL_LOADSO_DLCOMPAT */ +#define SDL_LOADSO_DLOPEN 1 +/* #undef SDL_LOADSO_LDG */ +/* #undef SDL_LOADSO_MACOS */ +/* #undef SDL_LOADSO_OS2 */ +/* #undef SDL_LOADSO_WIN32 */ + +/* Enable various threading systems */ +/* #undef SDL_THREAD_AMIGA */ +/* #undef SDL_THREAD_BEOS */ +/* #undef SDL_THREAD_DC */ +/* #undef SDL_THREAD_EPOC */ +/* #undef SDL_THREAD_OS2 */ +/* #undef SDL_THREAD_PTH */ +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 +/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */ +/* #undef SDL_THREAD_SPROC */ +/* #undef SDL_THREAD_WIN32 */ + +/* Enable various timer systems */ +/* #undef SDL_TIMER_AMIGA */ +/* #undef SDL_TIMER_BEOS */ +/* #undef SDL_TIMER_DC */ +/* #undef SDL_TIMER_EPOC */ +/* #undef SDL_TIMER_MACOS */ +/* #undef SDL_TIMER_MINT */ +/* #undef SDL_TIMER_OS2 */ +/* #undef SDL_TIMER_RISCOS */ +#define SDL_TIMER_UNIX 1 +/* #undef SDL_TIMER_WIN32 */ +/* #undef SDL_TIMER_WINCE */ + +/* Enable various video drivers */ +/* #undef SDL_VIDEO_DRIVER_AALIB */ +/* #undef SDL_VIDEO_DRIVER_BWINDOW */ +/* #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS */ +/* #undef SDL_VIDEO_DRIVER_DC */ +/* #undef SDL_VIDEO_DRIVER_DDRAW */ +#define SDL_VIDEO_DRIVER_DGA 1 +/* #undef SDL_VIDEO_DRIVER_DIRECTFB */ +/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */ +#define SDL_VIDEO_DRIVER_DUMMY 1 +/* #undef SDL_VIDEO_DRIVER_EPOC */ +#define SDL_VIDEO_DRIVER_FBCON 1 +/* #undef SDL_VIDEO_DRIVER_GAPI */ +/* #undef SDL_VIDEO_DRIVER_GEM */ +/* #undef SDL_VIDEO_DRIVER_GGI */ +/* #undef SDL_VIDEO_DRIVER_IPOD */ +/* #undef SDL_VIDEO_DRIVER_NANOX */ +/* #undef SDL_VIDEO_DRIVER_OS2FS */ +/* #undef SDL_VIDEO_DRIVER_PHOTON */ +/* #undef SDL_VIDEO_DRIVER_PICOGUI */ +/* #undef SDL_VIDEO_DRIVER_PS2GS */ +/* #undef SDL_VIDEO_DRIVER_QTOPIA */ +/* #undef SDL_VIDEO_DRIVER_QUARTZ */ +/* #undef SDL_VIDEO_DRIVER_RISCOS */ +/* #undef SDL_VIDEO_DRIVER_SVGALIB */ +/* #undef SDL_VIDEO_DRIVER_TOOLBOX */ +/* #undef SDL_VIDEO_DRIVER_VGL */ +/* #undef SDL_VIDEO_DRIVER_WINDIB */ +/* #undef SDL_VIDEO_DRIVER_WSCONS */ +#define SDL_VIDEO_DRIVER_X11 1 +#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6" +#define SDL_VIDEO_DRIVER_X11_VIDMODE 1 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 +#define SDL_VIDEO_DRIVER_X11_XME 1 +#define SDL_VIDEO_DRIVER_X11_XV 1 +/* #undef SDL_VIDEO_DRIVER_XBIOS */ + +/* Enable OpenGL support */ +#define SDL_VIDEO_OPENGL 1 +#define SDL_VIDEO_OPENGL_GLX 1 +/* #undef SDL_VIDEO_OPENGL_WGL */ +/* #undef SDL_VIDEO_OPENGL_OSMESA */ +/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ + +/* Enable assembly routines */ +#define SDL_ASSEMBLY_ROUTINES 1 +/* #undef SDL_HERMES_BLITTERS */ +/* #undef SDL_ALTIVEC_BLITTERS */ #endif /* _SDL_config_h */ diff --git a/include/SDL_config_dreamcast.h b/include/SDL_config_dreamcast.h index 8260db400..884a54a9b 100644 --- a/include/SDL_config_dreamcast.h +++ b/include/SDL_config_dreamcast.h @@ -41,10 +41,8 @@ #define HAVE_REALLOC 1 #define HAVE_FREE 1 #define HAVE_ALLOCA 1 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ #define HAVE_GETENV 1 #define HAVE_PUTENV 1 -#endif #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 #define HAVE_MEMMOVE 1 diff --git a/include/SDL_config_macos.h b/include/SDL_config_macos.h index 81ccb08ce..0e22f556f 100644 --- a/include/SDL_config_macos.h +++ b/include/SDL_config_macos.h @@ -25,14 +25,17 @@ /* This is a set of defines to configure the SDL features */ -#define SDL_HAS_64BIT_TYPE 1 +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef signed short int16_t; +typedef unsigned short uint16_t; +typedef signed int int32_t; +typedef unsigned int uint32_t; /* Useful headers */ -#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_SIGNAL_H 1 /* C library functions */ @@ -41,10 +44,6 @@ #define HAVE_REALLOC 1 #define HAVE_FREE 1 #define HAVE_ALLOCA 1 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ -#define HAVE_GETENV 1 -#define HAVE_PUTENV 1 -#endif #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 #define HAVE_MEMMOVE 1 @@ -63,7 +62,7 @@ #define SDL_LOADSO_MACOS 1 /* Enable various threading systems */ -#define SDL_THREAD_DISABLED 1 +#define SDL_THREADS_DISABLED 1 /* Enable various timer systems */ #define SDL_TIMER_MACOS 1 diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h index 06fa50165..b3cbbae49 100644 --- a/include/SDL_config_macosx.h +++ b/include/SDL_config_macosx.h @@ -41,10 +41,8 @@ #define HAVE_REALLOC 1 #define HAVE_FREE 1 #define HAVE_ALLOCA 1 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ #define HAVE_GETENV 1 #define HAVE_PUTENV 1 -#endif #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 #define HAVE_MEMMOVE 1 diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index 6360fd2f2..36c0a3099 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -34,9 +34,12 @@ #ifndef NO_SDL_GLEXT #define __glext_h_ /* Don't let gl.h include glext.h */ #endif -#ifdef __MACOSX__ +#if defined(__MACOSX__) #include /* Header File For The OpenGL Library */ #include /* Header File For The GLU Library */ +#elif defined(__MACOS__) +#include /* Header File For The OpenGL Library */ +#include /* Header File For The GLU Library */ #else #include /* Header File For The OpenGL Library */ #include /* Header File For The GLU Library */ diff --git a/src/endian/.cvsignore b/src/endian/.cvsignore deleted file mode 100644 index 899d53557..000000000 --- a/src/endian/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile.in -Makefile -.libs -*.o -*.lo -*.la diff --git a/src/main/macos/SDL_main.c b/src/main/macos/SDL_main.c index 2e745a6a4..348638b0d 100644 --- a/src/main/macos/SDL_main.c +++ b/src/main/macos/SDL_main.c @@ -24,10 +24,6 @@ in the MacOS environment. (stdio/stderr is *not* directed for Mach-O builds) */ -#include -#include -#include -#include #if defined(__APPLE__) && defined(__MACH__) #include #elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335) @@ -89,7 +85,7 @@ static int ParseCommandLine(char *cmdline, char **argv) argc = 0; for ( bufp = cmdline; *bufp; ) { /* Skip leading whitespace */ - while ( isspace(*bufp) ) { + while ( SDL_isspace(*bufp) ) { ++bufp; } /* Skip over argument */ @@ -113,7 +109,7 @@ static int ParseCommandLine(char *cmdline, char **argv) ++argc; } /* Skip over word */ - while ( *bufp && ! isspace(*bufp) ) { + while ( *bufp && ! SDL_isspace(*bufp) ) { ++bufp; } } @@ -176,7 +172,7 @@ static int getCurrentAppName (StrFileName name) { if ( noErr != GetProcessInformation (&process, &process_info) ) return 0; - memcpy (name, process_fsp.name, process_fsp.name[0] + 1); + SDL_memcpy(name, process_fsp.name, process_fsp.name[0] + 1); return 1; } @@ -205,8 +201,8 @@ static int getPrefsFile (FSSpec *prefs_fsp, int create) { if (app_name[0] > MAX_NAME ) app_name[0] = MAX_NAME; - memcpy (prefs_name + 1, app_name + 1, app_name[0]); - memcpy (prefs_name + app_name[0] + 1, SUFFIX, strlen (SUFFIX)); + SDL_memcpy(prefs_name + 1, app_name + 1, app_name[0]); + SDL_memcpy(prefs_name + app_name[0] + 1, SUFFIX, strlen (SUFFIX)); prefs_name[0] = app_name[0] + strlen (SUFFIX); /* Make the file spec for prefs file */ @@ -215,7 +211,7 @@ static int getPrefsFile (FSSpec *prefs_fsp, int create) { return 0; else { /* Create the prefs file */ - memcpy (prefs_fsp->name, prefs_name, prefs_name[0] + 1); + SDL_memcpy(prefs_fsp->name, prefs_name, prefs_name[0] + 1); prefs_fsp->parID = directory_id; prefs_fsp->vRefNum = volume_ref_number; @@ -241,11 +237,11 @@ static int readPrefsResource (PrefsRecord *prefs) { HLock(prefs_handle); /* Get command line string */ - memcpy (prefs->command_line, *prefs_handle, (*prefs_handle)[0]+1); + SDL_memcpy(prefs->command_line, *prefs_handle, (*prefs_handle)[0]+1); /* Get video driver name */ offset += (*prefs_handle)[0] + 1; - memcpy (prefs->video_driver_name, *prefs_handle + offset, (*prefs_handle)[offset] + 1); + SDL_memcpy(prefs->video_driver_name, *prefs_handle + offset, (*prefs_handle)[offset] + 1); /* Get save-to-file option (1 or 0) */ offset += (*prefs_handle)[offset] + 1; @@ -278,11 +274,11 @@ static int writePrefsResource (PrefsRecord *prefs, short resource_file) { /* Command line text */ offset = 0; - memcpy (*prefs_handle, prefs->command_line, prefs->command_line[0] + 1); + SDL_memcpy(*prefs_handle, prefs->command_line, prefs->command_line[0] + 1); /* Video driver name */ offset += prefs->command_line[0] + 1; - memcpy (*prefs_handle + offset, prefs->video_driver_name, prefs->video_driver_name[0] + 1); + SDL_memcpy(*prefs_handle + offset, prefs->video_driver_name, prefs->video_driver_name[0] + 1); /* Output-to-file option */ offset += prefs->video_driver_name[0] + 1; @@ -436,9 +432,9 @@ int main(int argc, char *argv[]) if ( readPreferences (&prefs) ) { - if (memcmp (prefs.video_driver_name+1, "DSp", 3) == 0) + if (SDL_memcmp(prefs.video_driver_name+1, "DSp", 3) == 0) videodriver = 1; - else if (memcmp (prefs.video_driver_name+1, "toolbox", 7) == 0) + else if (SDL_memcmp(prefs.video_driver_name+1, "toolbox", 7) == 0) videodriver = 2; } @@ -540,12 +536,12 @@ int main(int argc, char *argv[]) /* Set pseudo-environment variables for video driver, update prefs */ switch ( videodriver ) { case VIDEO_ID_DRAWSPROCKET: - putenv ("SDL_VIDEODRIVER=DSp"); - memcpy (prefs.video_driver_name, "\pDSp", 4); + SDL_putenv("SDL_VIDEODRIVER=DSp"); + SDL_memcpy(prefs.video_driver_name, "\pDSp", 4); break; case VIDEO_ID_TOOLBOX: - putenv ("SDL_VIDEODRIVER=toolbox"); - memcpy (prefs.video_driver_name, "\ptoolbox", 8); + SDL_putenv("SDL_VIDEODRIVER=toolbox"); + SDL_memcpy(prefs.video_driver_name, "\ptoolbox", 8); break; } @@ -582,9 +578,9 @@ int main(int argc, char *argv[]) if ( appNameText[i] == ' ' ) appNameText[i] = '_'; /* Copy app name & full command text to command-line C-string */ - memcpy (commandLine, appNameText + 1, appNameText[0]); + SDL_memcpy(commandLine, appNameText + 1, appNameText[0]); commandLine[appNameText[0]] = ' '; - memcpy (commandLine + appNameText[0] + 1, prefs.command_line + 1, prefs.command_line[0]); + SDL_memcpy(commandLine + appNameText[0] + 1, prefs.command_line + 1, prefs.command_line[0]); commandLine[ appNameText[0] + 1 + prefs.command_line[0] ] = '\0'; /* Parse C-string into argv and argc */ diff --git a/src/main/macos/exports/SDL.x b/src/main/macos/exports/SDL.x index 2226778cb..11514ecb7 100644 --- a/src/main/macos/exports/SDL.x +++ b/src/main/macos/exports/SDL.x @@ -37,18 +37,6 @@ SDL_HasSSE SDL_HasSSE2 SDL_HasAltiVec - SDL_ReadLE16 - SDL_ReadBE16 - SDL_ReadLE32 - SDL_ReadBE32 - SDL_ReadLE64 - SDL_ReadBE64 - SDL_WriteLE16 - SDL_WriteBE16 - SDL_WriteLE32 - SDL_WriteBE32 - SDL_WriteLE64 - SDL_WriteBE64 SDL_SetError SDL_GetError SDL_ClearError @@ -61,8 +49,6 @@ SDL_SetEventFilter SDL_GetEventFilter SDL_EventState - SDL_putenv - SDL_getenv SDL_NumJoysticks SDL_JoystickName SDL_JoystickOpen @@ -119,8 +105,21 @@ SDL_RWFromConstMem SDL_AllocRW SDL_FreeRW + SDL_ReadLE16 + SDL_ReadBE16 + SDL_ReadLE32 + SDL_ReadBE32 + SDL_ReadLE64 + SDL_ReadBE64 + SDL_WriteLE16 + SDL_WriteBE16 + SDL_WriteLE32 + SDL_WriteBE32 + SDL_WriteLE64 + SDL_WriteBE64 SDL_GetWMInfo SDL_CreateThread + SDL_CreateThread SDL_ThreadID SDL_GetThreadID SDL_WaitThread @@ -188,4 +187,28 @@ SDL_WM_ToggleFullScreen SDL_WM_GrabInput SDL_SoftStretch + SDL_putenv + SDL_getenv + SDL_qsort + SDL_revcpy + SDL_strlen + SDL_strlcpy + SDL_strlcat + SDL_strdup + SDL_strrev + SDL_strupr + SDL_strlwr + SDL_strchr + SDL_strrchr + SDL_strstr + SDL_ltoa + SDL_ultoa + SDL_strtol + SDL_strtod + SDL_strcmp + SDL_strncmp + SDL_strcasecmp + SDL_sscanf + SDL_snprintf + SDL_vsnprintf SDL_InitQuickDraw diff --git a/src/main/macos/exports/gendef.pl b/src/main/macos/exports/gendef.pl index 942214b0a..13d818bf2 100644 --- a/src/main/macos/exports/gendef.pl +++ b/src/main/macos/exports/gendef.pl @@ -23,4 +23,28 @@ while ( ($file = shift(@ARGV)) ) { } # Special exports to include for this platform +print "\tSDL_putenv\n"; +print "\tSDL_getenv\n"; +print "\tSDL_qsort\n"; +print "\tSDL_revcpy\n"; +print "\tSDL_strlen\n"; +print "\tSDL_strlcpy\n"; +print "\tSDL_strlcat\n"; +print "\tSDL_strdup\n"; +print "\tSDL_strrev\n"; +print "\tSDL_strupr\n"; +print "\tSDL_strlwr\n"; +print "\tSDL_strchr\n"; +print "\tSDL_strrchr\n"; +print "\tSDL_strstr\n"; +print "\tSDL_ltoa\n"; +print "\tSDL_ultoa\n"; +print "\tSDL_strtol\n"; +print "\tSDL_strtod\n"; +print "\tSDL_strcmp\n"; +print "\tSDL_strncmp\n"; +print "\tSDL_strcasecmp\n"; +print "\tSDL_sscanf\n"; +print "\tSDL_snprintf\n"; +print "\tSDL_vsnprintf\n"; print "\tSDL_InitQuickDraw\n"; diff --git a/src/video/e_pow.h b/src/video/e_pow.h index e9a5b1659..0aa372a68 100644 --- a/src/video/e_pow.h +++ b/src/video/e_pow.h @@ -296,7 +296,7 @@ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ z = one-(r-z); GET_HIGH_WORD(j,z); j += (n<<20); - if((j>>20)<=0) z = scalbn(z,n); /* subnormal output */ + if((j>>20)<=0) z = SDL_NAME(scalbn)(z,n); /* subnormal output */ else SET_HIGH_WORD(z,j); return s*z; } diff --git a/src/video/e_sqrt.h b/src/video/e_sqrt.h index 9a019b087..657380ea4 100644 --- a/src/video/e_sqrt.h +++ b/src/video/e_sqrt.h @@ -88,9 +88,9 @@ static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $"; #include "math_private.h" #ifdef __STDC__ - double copysign(double x, double y) + double SDL_NAME(copysign)(double x, double y) #else - double copysign(x,y) + double SDL_NAME(copysign)(x,y) double x,y; #endif { @@ -102,9 +102,9 @@ static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $"; } #ifdef __STDC__ - double scalbn (double x, int n) + double SDL_NAME(scalbn) (double x, int n) #else - double scalbn (x,n) + double SDL_NAME(scalbn) (x,n) double x; int n; #endif { @@ -120,13 +120,13 @@ static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $"; } if (k==0x7ff) return x+x; /* NaN or Inf */ k = k+n; - if (k > 0x7fe) return huge*copysign(huge,x); /* overflow */ + if (k > 0x7fe) return huge*SDL_NAME(copysign)(huge,x); /* overflow */ if (k > 0) /* normal result */ {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;} if (k <= -54) { if (n > 50000) /* in case integer overflow in n+k */ - return huge*copysign(huge,x); /*overflow*/ - else return tiny*copysign(tiny,x); /*underflow*/ + return huge*SDL_NAME(copysign)(huge,x); /*overflow*/ + else return tiny*SDL_NAME(copysign)(tiny,x); /*underflow*/ } k += 54; /* subnormal result */ SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); diff --git a/src/video/maccommon/SDL_lowvideo.h b/src/video/maccommon/SDL_lowvideo.h index d902c6e66..4151412dd 100644 --- a/src/video/maccommon/SDL_lowvideo.h +++ b/src/video/maccommon/SDL_lowvideo.h @@ -36,7 +36,13 @@ #endif #if SDL_VIDEO_OPENGL -#include "SDL_opengl.h" +#ifdef MACOSX +#include /* OpenGL.framework */ +#include /* AGL.framework */ +#else +#include +#include +#endif /* MACOSX */ #endif #include "SDL_video.h" diff --git a/src/video/maccommon/SDL_macevents_c.h b/src/video/maccommon/SDL_macevents_c.h index 32bd1fa04..8ea92ae44 100644 --- a/src/video/maccommon/SDL_macevents_c.h +++ b/src/video/maccommon/SDL_macevents_c.h @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#include "SDL_romvideo.h" +#include "../macrom/SDL_romvideo.h" /* Functions exported by SDL_macevents.c for the video subsystem */ diff --git a/src/video/maccommon/SDL_macgl_c.h b/src/video/maccommon/SDL_macgl_c.h index 1ac470bbf..c43327915 100644 --- a/src/video/maccommon/SDL_macgl_c.h +++ b/src/video/maccommon/SDL_macgl_c.h @@ -25,7 +25,13 @@ #include "SDL_config.h" #if SDL_VIDEO_OPENGL -#include "SDL_opengl.h" +#ifdef MACOSX +#include /* OpenGL.framework */ +#include /* AGL.framework */ +#else +#include +#include +#endif /* MACOSX */ #endif /* OpenGL functions */ diff --git a/src/video/maccommon/SDL_macmouse_c.h b/src/video/maccommon/SDL_macmouse_c.h index 12df7be38..deba59285 100644 --- a/src/video/maccommon/SDL_macmouse_c.h +++ b/src/video/maccommon/SDL_macmouse_c.h @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#include "SDL_romvideo.h" +#include "../macrom/SDL_romvideo.h" /* Functions to be exported */ extern void Mac_FreeWMCursor(_THIS, WMcursor *cursor); diff --git a/src/video/maccommon/SDL_macwm_c.h b/src/video/maccommon/SDL_macwm_c.h index 35ea2c037..5f56b699d 100644 --- a/src/video/maccommon/SDL_macwm_c.h +++ b/src/video/maccommon/SDL_macwm_c.h @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#include "SDL_romvideo.h" +#include "../macrom/SDL_romvideo.h" /* Functions to be exported */ extern void Mac_SetCaption(_THIS, const char *title, const char *icon); diff --git a/src/video/macdsp/SDL_dspvideo.c b/src/video/macdsp/SDL_dspvideo.c index bd1c0672a..a0f0210f9 100644 --- a/src/video/macdsp/SDL_dspvideo.c +++ b/src/video/macdsp/SDL_dspvideo.c @@ -144,10 +144,10 @@ #include "../SDL_blit.h" #include "../SDL_pixels_c.h" #include "SDL_dspvideo.h" -#include "SDL_macgl_c.h" -#include "SDL_macwm_c.h" -#include "SDL_macmouse_c.h" -#include "SDL_macevents_c.h" +#include "../maccommon/SDL_macgl_c.h" +#include "../maccommon/SDL_macwm_c.h" +#include "../maccommon/SDL_macmouse_c.h" +#include "../maccommon/SDL_macevents_c.h" /* Initialization/Query functions */ static int DSp_VideoInit(_THIS, SDL_PixelFormat *vformat); diff --git a/src/video/macdsp/SDL_dspvideo.h b/src/video/macdsp/SDL_dspvideo.h index 2a786f885..3b49da608 100644 --- a/src/video/macdsp/SDL_dspvideo.h +++ b/src/video/macdsp/SDL_dspvideo.h @@ -30,7 +30,7 @@ #include #endif -#include "SDL_lowvideo.h" +#include "../maccommon/SDL_lowvideo.h" /* DrawSprocket specific information */ struct DSpInfo { diff --git a/src/video/macrom/SDL_romvideo.c b/src/video/macrom/SDL_romvideo.c index 6a58fe1ef..af3b8248e 100644 --- a/src/video/macrom/SDL_romvideo.c +++ b/src/video/macrom/SDL_romvideo.c @@ -46,10 +46,10 @@ #include "SDL_syswm.h" #include "../SDL_sysvideo.h" #include "SDL_romvideo.h" -#include "SDL_macgl_c.h" -#include "SDL_macwm_c.h" -#include "SDL_macmouse_c.h" -#include "SDL_macevents_c.h" +#include "../maccommon/SDL_macgl_c.h" +#include "../maccommon/SDL_macwm_c.h" +#include "../maccommon/SDL_macmouse_c.h" +#include "../maccommon/SDL_macevents_c.h" /* Initialization/Query functions */ static int ROM_VideoInit(_THIS, SDL_PixelFormat *vformat); diff --git a/src/video/macrom/SDL_romvideo.h b/src/video/macrom/SDL_romvideo.h index 12e616c8d..96910d41d 100644 --- a/src/video/macrom/SDL_romvideo.h +++ b/src/video/macrom/SDL_romvideo.h @@ -24,6 +24,6 @@ #ifndef _SDL_romvideo_h #define _SDL_romvideo_h -#include "SDL_lowvideo.h" +#include "../maccommon/SDL_lowvideo.h" #endif /* _SDL_romvideo_h */ diff --git a/src/video/math_private.h b/src/video/math_private.h index 1339ef0c1..1087d7dea 100644 --- a/src/video/math_private.h +++ b/src/video/math_private.h @@ -17,6 +17,7 @@ #ifndef _MATH_PRIVATE_H_ #define _MATH_PRIVATE_H_ +#include "SDL_name.h" #include "SDL_endian.h" #define huge really_big /* huge is a reserved keyword in VC++ 6.0 */ diff --git a/test/testplatform.c b/test/testplatform.c index b973a3f15..d67991b3b 100644 --- a/test/testplatform.c +++ b/test/testplatform.c @@ -78,7 +78,7 @@ int TestEndian(SDL_bool verbose) printf("Detected a %s endian machine.\n", (SDL_BYTEORDER == SDL_LIL_ENDIAN) ? "little" : "big"); } - if ( *((char *)&value) == '1' ) { + if ( (*((char *)&value) >> 4) == 0x1 ) { real_byteorder = SDL_BIG_ENDIAN; } else { real_byteorder = SDL_LIL_ENDIAN;