Date: Wed, 26 Nov 2003 01:52:02 +0800
authorSam Lantinga <slouken@libsdl.org>
Sun, 04 Jan 2004 15:48:44 +0000
changeset 766ed57c876700d
parent 765 4c2ba6161939
child 767 d9e79e31a7b7
Date: Wed, 26 Nov 2003 01:52:02 +0800
From: "Andy Pfiffer"
Subject: [SDL] patch: PocketPC 2000 diffs for release_1_2_6

I was making a backup of my current workspace of SDL for PocketPC,
and thought I would send out my diffs.

Apologies in advance if the patch has become whitespace mangled.

These diffs are relative to CVS tag release_1_2_6, and contain (I think)
all changes that have been mentioned on the mailing list in the last
few months.

I only have PocketPC 2000 & an ARM-based device (iPaq 3635), and I
only use Embedded Visual Tools 3.0, so I can't say for sure if it
breaks other PocketPC 200[023] builds.
src/main/win32/SDL_win32_main.c
src/video/wincommon/SDL_wingl.c
src/video/windib/SDL_dibvideo.c
test/testtimer.c
     1.1 --- a/src/main/win32/SDL_win32_main.c	Sun Jan 04 15:40:50 2004 +0000
     1.2 +++ b/src/main/win32/SDL_win32_main.c	Sun Jan 04 15:48:44 2004 +0000
     1.3 @@ -14,9 +14,10 @@
     1.4  
     1.5  #ifdef _WIN32_WCE
     1.6  # define DIR_SEPERATOR TEXT("\\")
     1.7 -# define _getcwd(str,len)	wcscpy(str,DIR_SEPERATOR);
     1.8 -# define setbuf(x)
     1.9 -# define setvbuf(x)
    1.10 +# undef _getcwd
    1.11 +# define _getcwd(str,len)	wcscpy(str,TEXT(""))
    1.12 +# define setbuf(f,b)
    1.13 +# define setvbuf(w,x,y,z)
    1.14  # define fopen		_wfopen
    1.15  # define freopen	_wfreopen
    1.16  # define remove(x)	DeleteFile(x)
     2.1 --- a/src/video/wincommon/SDL_wingl.c	Sun Jan 04 15:40:50 2004 +0000
     2.2 +++ b/src/video/wincommon/SDL_wingl.c	Sun Jan 04 15:48:44 2004 +0000
     2.3 @@ -79,6 +79,7 @@
     2.4  	return(status);
     2.5  }
     2.6  
     2.7 +#ifdef HAVE_OPENGL
     2.8  static void Init_WGL_ARB_extensions(_THIS)
     2.9  {
    2.10  	HWND hwnd;
    2.11 @@ -127,6 +128,7 @@
    2.12  	ReleaseDC(hwnd, hdc);
    2.13  	DestroyWindow(hwnd);
    2.14  }
    2.15 +#endif /* !HAVE_OPENGL */
    2.16  
    2.17  int WIN_GL_SetupWindow(_THIS)
    2.18  {
     3.1 --- a/src/video/windib/SDL_dibvideo.c	Sun Jan 04 15:40:50 2004 +0000
     3.2 +++ b/src/video/windib/SDL_dibvideo.c	Sun Jan 04 15:48:44 2004 +0000
     3.3 @@ -58,7 +58,10 @@
     3.4  #define NO_GAMMA_SUPPORT
     3.5  #endif
     3.6  #ifndef WS_MAXIMIZE
     3.7 -#define WS_MAXIMIZE		0
     3.8 +#define WS_MAXIMIZE	0
     3.9 +#endif
    3.10 +#ifndef WS_THICKFRAME
    3.11 +#define WS_THICKFRAME	0
    3.12  #endif
    3.13  #ifndef SWP_NOCOPYBITS
    3.14  #define SWP_NOCOPYBITS	0
     4.1 --- a/test/testtimer.c	Sun Jan 04 15:40:50 2004 +0000
     4.2 +++ b/test/testtimer.c	Sun Jan 04 15:48:44 2004 +0000
     4.3 @@ -63,13 +63,13 @@
     4.4  	printf("Testing multiple timers...\n");
     4.5  	t1 = SDL_AddTimer(100, callback, (void*)1);
     4.6  	if(!t1)
     4.7 -	  fprintf(stderr,"Could not create timer 1\n");
     4.8 +	  fprintf(stderr,"Could not create timer 1: %s\n", SDL_GetError());
     4.9  	t2 = SDL_AddTimer(50, callback, (void*)2);
    4.10  	if(!t2)
    4.11 -	  fprintf(stderr,"Could not create timer 2\n");
    4.12 +	  fprintf(stderr,"Could not create timer 2: %s\n", SDL_GetError());
    4.13  	t3 = SDL_AddTimer(233, callback, (void*)3);
    4.14  	if(!t3)
    4.15 -	  fprintf(stderr,"Could not create timer 3\n");
    4.16 +	  fprintf(stderr,"Could not create timer 3: %s\n", SDL_GetError());
    4.17  	
    4.18  	/* Wait 10 seconds */
    4.19  	printf("Waiting 10 seconds\n");