Updated MacOS Classic build
authorSam Lantinga <slouken@libsdl.org>
Mon, 13 Mar 2006 05:36:42 +0000
changeset 15164d241ea8a1cd
parent 1515 1e18097b1d7a
child 1517 39f6ad4693a5
Updated MacOS Classic build
CWprojects.sea.bin
MPWmake.sea.bin
include/SDL_config_macos.h
src/main/macos/exports/SDL.x
src/main/macos/exports/gendef.pl
src/main/macosx/exports/SDL.x
src/main/macosx/exports/gendef.pl
test/testalpha.c
test/testiconv.c
test/testpalette.c
test/testsprite.c
     1.1 Binary file CWprojects.sea.bin has changed
     2.1 Binary file MPWmake.sea.bin has changed
     3.1 --- a/include/SDL_config_macos.h	Mon Mar 13 04:35:59 2006 +0000
     3.2 +++ b/include/SDL_config_macos.h	Mon Mar 13 05:36:42 2006 +0000
     3.3 @@ -31,6 +31,7 @@
     3.4  typedef unsigned short	uint16_t;
     3.5  typedef signed int	int32_t;
     3.6  typedef unsigned int	uint32_t;
     3.7 +typedef unsigned int	uintptr_t;
     3.8  
     3.9  /* Useful headers */
    3.10  #define HAVE_STDIO_H	1
    3.11 @@ -62,8 +63,6 @@
    3.12  #define HAVE_ATOF	1
    3.13  #define HAVE_STRCMP	1
    3.14  #define HAVE_STRNCMP	1
    3.15 -#define HAVE_STRICMP	1
    3.16 -#define HAVE_STRCASECMP	1
    3.17  #define HAVE_SSCANF	1
    3.18  
    3.19  /* Enable various audio drivers */
     4.1 --- a/src/main/macos/exports/SDL.x	Mon Mar 13 04:35:59 2006 +0000
     4.2 +++ b/src/main/macos/exports/SDL.x	Mon Mar 13 05:36:42 2006 +0000
     4.3 @@ -67,6 +67,7 @@
     4.4  	SDL_JoystickClose
     4.5  	SDL_EnableUNICODE
     4.6  	SDL_EnableKeyRepeat
     4.7 +	SDL_GetKeyRepeat
     4.8  	SDL_GetKeyState
     4.9  	SDL_GetModState
    4.10  	SDL_SetModState
    4.11 @@ -199,6 +200,9 @@
    4.12  	SDL_strlwr
    4.13  	SDL_ltoa
    4.14  	SDL_ultoa
    4.15 +	SDL_strcasecmp
    4.16 +	SDL_strncasecmp
    4.17  	SDL_snprintf
    4.18  	SDL_vsnprintf
    4.19 +	SDL_iconv_string
    4.20  	SDL_InitQuickDraw
     5.1 --- a/src/main/macos/exports/gendef.pl	Mon Mar 13 04:35:59 2006 +0000
     5.2 +++ b/src/main/macos/exports/gendef.pl	Mon Mar 13 05:36:42 2006 +0000
     5.3 @@ -3,7 +3,6 @@
     5.4  # Program to take a set of header files and generate DLL export definitions
     5.5  
     5.6  # Special exports to ignore for this platform
     5.7 -$exclude{"SDL_CreateThread_Core"} = 1;
     5.8  
     5.9  while ( ($file = shift(@ARGV)) ) {
    5.10  	if ( ! defined(open(FILE, $file)) ) {
    5.11 @@ -35,6 +34,9 @@
    5.12  print "\tSDL_strlwr\n";
    5.13  print "\tSDL_ltoa\n";
    5.14  print "\tSDL_ultoa\n";
    5.15 +print "\tSDL_strcasecmp\n";
    5.16 +print "\tSDL_strncasecmp\n";
    5.17  print "\tSDL_snprintf\n";
    5.18  print "\tSDL_vsnprintf\n";
    5.19 +print "\tSDL_iconv_string\n";
    5.20  print "\tSDL_InitQuickDraw\n";
     6.1 --- a/src/main/macosx/exports/SDL.x	Mon Mar 13 04:35:59 2006 +0000
     6.2 +++ b/src/main/macosx/exports/SDL.x	Mon Mar 13 05:36:42 2006 +0000
     6.3 @@ -37,18 +37,6 @@
     6.4  	_SDL_HasSSE
     6.5  	_SDL_HasSSE2
     6.6  	_SDL_HasAltiVec
     6.7 -	_SDL_ReadLE16
     6.8 -	_SDL_ReadBE16
     6.9 -	_SDL_ReadLE32
    6.10 -	_SDL_ReadBE32
    6.11 -	_SDL_ReadLE64
    6.12 -	_SDL_ReadBE64
    6.13 -	_SDL_WriteLE16
    6.14 -	_SDL_WriteBE16
    6.15 -	_SDL_WriteLE32
    6.16 -	_SDL_WriteBE32
    6.17 -	_SDL_WriteLE64
    6.18 -	_SDL_WriteBE64
    6.19  	_SDL_SetError
    6.20  	_SDL_GetError
    6.21  	_SDL_ClearError
    6.22 @@ -79,6 +67,7 @@
    6.23  	_SDL_JoystickClose
    6.24  	_SDL_EnableUNICODE
    6.25  	_SDL_EnableKeyRepeat
    6.26 +	_SDL_GetKeyRepeat
    6.27  	_SDL_GetKeyState
    6.28  	_SDL_GetModState
    6.29  	_SDL_SetModState
    6.30 @@ -117,8 +106,21 @@
    6.31  	_SDL_RWFromConstMem
    6.32  	_SDL_AllocRW
    6.33  	_SDL_FreeRW
    6.34 +	_SDL_ReadLE16
    6.35 +	_SDL_ReadBE16
    6.36 +	_SDL_ReadLE32
    6.37 +	_SDL_ReadBE32
    6.38 +	_SDL_ReadLE64
    6.39 +	_SDL_ReadBE64
    6.40 +	_SDL_WriteLE16
    6.41 +	_SDL_WriteBE16
    6.42 +	_SDL_WriteLE32
    6.43 +	_SDL_WriteBE32
    6.44 +	_SDL_WriteLE64
    6.45 +	_SDL_WriteBE64
    6.46  	_SDL_GetWMInfo
    6.47  	_SDL_CreateThread
    6.48 +	_SDL_CreateThread
    6.49  	_SDL_ThreadID
    6.50  	_SDL_GetThreadID
    6.51  	_SDL_WaitThread
    6.52 @@ -186,5 +188,6 @@
    6.53  	_SDL_WM_ToggleFullScreen
    6.54  	_SDL_WM_GrabInput
    6.55  	_SDL_SoftStretch
    6.56 +	SDL_iconv_string
    6.57  	.objc_class_name_SDL_QuartzWindow
    6.58  	.objc_class_name_SDL_QuartzWindowDelegate
     7.1 --- a/src/main/macosx/exports/gendef.pl	Mon Mar 13 04:35:59 2006 +0000
     7.2 +++ b/src/main/macosx/exports/gendef.pl	Mon Mar 13 05:36:42 2006 +0000
     7.3 @@ -5,7 +5,6 @@
     7.4  # Special exports to ignore for this platform
     7.5  $exclude{"SDL_putenv"} = 1;
     7.6  $exclude{"SDL_getenv"} = 1;
     7.7 -$exclude{"SDL_CreateThread_Core"} = 1;
     7.8  
     7.9  while ( ($file = shift(@ARGV)) ) {
    7.10  	if ( ! defined(open(FILE, $file)) ) {
    7.11 @@ -24,5 +23,6 @@
    7.12  }
    7.13  
    7.14  # Special exports to include for this platform
    7.15 +print "\tSDL_iconv_string\n";
    7.16  print "\t.objc_class_name_SDL_QuartzWindow\n";
    7.17  print "\t.objc_class_name_SDL_QuartzWindowDelegate\n";
     8.1 --- a/test/testalpha.c	Mon Mar 13 04:35:59 2006 +0000
     8.2 +++ b/test/testalpha.c	Mon Mar 13 05:36:42 2006 +0000
     8.3 @@ -60,7 +60,7 @@
     8.4  }
     8.5  
     8.6  /* Create a "light" -- a yellowish surface with variable alpha */
     8.7 -SDL_Surface *CreateLight(SDL_Surface *screen, int radius)
     8.8 +SDL_Surface *CreateLight(int radius)
     8.9  {
    8.10  	Uint8  trans, alphamask;
    8.11  	int    range, addition;
    8.12 @@ -401,7 +401,7 @@
    8.13  	FillBackground(screen);
    8.14  
    8.15  	/* Create the light */
    8.16 -	light = CreateLight(screen, 82);
    8.17 +	light = CreateLight(82);
    8.18  	if ( light == NULL ) {
    8.19  		quit(1);
    8.20  	}
     9.1 --- a/test/testiconv.c	Mon Mar 13 04:35:59 2006 +0000
     9.2 +++ b/test/testiconv.c	Mon Mar 13 05:36:42 2006 +0000
     9.3 @@ -44,7 +44,7 @@
     9.4  	char buffer[BUFSIZ];
     9.5  	char *ucs4;
     9.6  	char *test[2];
     9.7 -	int i, j, index = 0;
     9.8 +	int i, index = 0;
     9.9  	FILE *file;
    9.10  	int errors = 0;
    9.11  
    9.12 @@ -59,8 +59,9 @@
    9.13  
    9.14  	while ( fgets(buffer, sizeof(buffer), file) ) {
    9.15  		/* Convert to UCS-4 */
    9.16 +		size_t len;
    9.17  		ucs4 = SDL_iconv_string("UCS-4", "UTF-8", buffer, SDL_strlen(buffer)+1);
    9.18 -		size_t len = (widelen(ucs4)+1)*4;
    9.19 +		len = (widelen(ucs4)+1)*4;
    9.20  		for ( i = 0; i < SDL_arraysize(formats); ++i ) {
    9.21  			if ( (SDL_strncasecmp(formats[i], "UTF16", 5) == 0 ||
    9.22  			      SDL_strncasecmp(formats[i], "UTF-16", 6) == 0 ||
    10.1 --- a/test/testpalette.c	Mon Mar 13 04:35:59 2006 +0000
    10.2 +++ b/test/testpalette.c	Mon Mar 13 05:36:42 2006 +0000
    10.3 @@ -167,7 +167,7 @@
    10.4      }
    10.5  
    10.6      /* Ask explicitly for 8bpp and a hardware palette */
    10.7 -    if(!(screen = SDL_SetVideoMode(SCRW, SCRH, 8, vidflags | SDL_HWPALETTE))) {
    10.8 +    if((screen = SDL_SetVideoMode(SCRW, SCRH, 8, vidflags | SDL_HWPALETTE)) == NULL) {
    10.9  	fprintf(stderr, "error setting %dx%d 8bpp indexed mode: %s\n",
   10.10  		SCRW, SCRH, SDL_GetError());
   10.11  	quit(1);
   10.12 @@ -175,7 +175,7 @@
   10.13  
   10.14      if (vidflags & SDL_FULLSCREEN) SDL_ShowCursor (SDL_FALSE);
   10.15  
   10.16 -    if(!(boat[0] = SDL_LoadBMP("sail.bmp")))
   10.17 +    if((boat[0] = SDL_LoadBMP("sail.bmp")) == NULL)
   10.18  	sdlerr("loading sail.bmp");
   10.19      /* We've chosen magenta (#ff00ff) as colour key for the boat */
   10.20      SDL_SetColorKey(boat[0], SDL_SRCCOLORKEY | SDL_RLEACCEL,
    11.1 --- a/test/testsprite.c	Mon Mar 13 04:35:59 2006 +0000
    11.2 +++ b/test/testsprite.c	Mon Mar 13 05:36:42 2006 +0000
    11.3 @@ -28,7 +28,7 @@
    11.4  	exit(rc);
    11.5  }
    11.6  
    11.7 -int LoadSprite(SDL_Surface *screen, char *file)
    11.8 +int LoadSprite(char *file)
    11.9  {
   11.10  	SDL_Surface *temp;
   11.11  
   11.12 @@ -221,7 +221,7 @@
   11.13  	}
   11.14  
   11.15  	/* Load the sprite */
   11.16 -	if ( LoadSprite(screen, "icon.bmp") < 0 ) {
   11.17 +	if ( LoadSprite("icon.bmp") < 0 ) {
   11.18  		quit(1);
   11.19  	}
   11.20