Mercurial > sdl-ios-xcode
changeset 766:ed57c876700d
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.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 04 Jan 2004 15:48:44 +0000 |
| parents | 4c2ba6161939 |
| children | d9e79e31a7b7 |
| files | src/main/win32/SDL_win32_main.c src/video/wincommon/SDL_wingl.c src/video/windib/SDL_dibvideo.c test/testtimer.c |
| diffstat | 4 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/win32/SDL_win32_main.c Sun Jan 04 15:40:50 2004 +0000 +++ b/src/main/win32/SDL_win32_main.c Sun Jan 04 15:48:44 2004 +0000 @@ -14,9 +14,10 @@ #ifdef _WIN32_WCE # define DIR_SEPERATOR TEXT("\\") -# define _getcwd(str,len) wcscpy(str,DIR_SEPERATOR); -# define setbuf(x) -# define setvbuf(x) +# undef _getcwd +# define _getcwd(str,len) wcscpy(str,TEXT("")) +# define setbuf(f,b) +# define setvbuf(w,x,y,z) # define fopen _wfopen # define freopen _wfreopen # define remove(x) DeleteFile(x)
--- a/src/video/wincommon/SDL_wingl.c Sun Jan 04 15:40:50 2004 +0000 +++ b/src/video/wincommon/SDL_wingl.c Sun Jan 04 15:48:44 2004 +0000 @@ -79,6 +79,7 @@ return(status); } +#ifdef HAVE_OPENGL static void Init_WGL_ARB_extensions(_THIS) { HWND hwnd; @@ -127,6 +128,7 @@ ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } +#endif /* !HAVE_OPENGL */ int WIN_GL_SetupWindow(_THIS) {
--- a/src/video/windib/SDL_dibvideo.c Sun Jan 04 15:40:50 2004 +0000 +++ b/src/video/windib/SDL_dibvideo.c Sun Jan 04 15:48:44 2004 +0000 @@ -58,7 +58,10 @@ #define NO_GAMMA_SUPPORT #endif #ifndef WS_MAXIMIZE -#define WS_MAXIMIZE 0 +#define WS_MAXIMIZE 0 +#endif +#ifndef WS_THICKFRAME +#define WS_THICKFRAME 0 #endif #ifndef SWP_NOCOPYBITS #define SWP_NOCOPYBITS 0
--- a/test/testtimer.c Sun Jan 04 15:40:50 2004 +0000 +++ b/test/testtimer.c Sun Jan 04 15:48:44 2004 +0000 @@ -63,13 +63,13 @@ printf("Testing multiple timers...\n"); t1 = SDL_AddTimer(100, callback, (void*)1); if(!t1) - fprintf(stderr,"Could not create timer 1\n"); + fprintf(stderr,"Could not create timer 1: %s\n", SDL_GetError()); t2 = SDL_AddTimer(50, callback, (void*)2); if(!t2) - fprintf(stderr,"Could not create timer 2\n"); + fprintf(stderr,"Could not create timer 2: %s\n", SDL_GetError()); t3 = SDL_AddTimer(233, callback, (void*)3); if(!t3) - fprintf(stderr,"Could not create timer 3\n"); + fprintf(stderr,"Could not create timer 3: %s\n", SDL_GetError()); /* Wait 10 seconds */ printf("Waiting 10 seconds\n");