Patch: PocketPC 2000 diffs for release_1_2_6

Sam,

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.

Please consider applying.

Thanks,
Andy

Index: src/main/win32/SDL_main.c===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/main/win32/SDL_main.c,v
retrieving revision 1.13
diff -n -a -u -r1.13 SDL_main.c
— src/main/win32/SDL_main.c 21 Jan 2003 04:15:21 -0000 1.13
+++ src/main/win32/SDL_main.c 25 Nov 2003 17:30:12 -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)

Index: src/video/wincommon/SDL_wingl.c

RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/wincommon/SDL_wingl.c,v
retrieving revision 1.12
diff -n -a -u -r1.12 SDL_wingl.c
— src/video/wincommon/SDL_wingl.c 9 Aug 2003 18:27:27 -0000 1.12
+++ src/video/wincommon/SDL_wingl.c 25 Nov 2003 17:30:12 -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)
{
Index: src/video/windib/SDL_dibvideo.c

RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/windib/SDL_dibvideo.c,v
retrieving revision 1.20
diff -n -a -u -r1.20 SDL_dibvideo.c
— src/video/windib/SDL_dibvideo.c 6 Oct 2002 20:31:34 -0000 1.20
+++ src/video/windib/SDL_dibvideo.c 25 Nov 2003 17:30:12 -0000
@@ -53,6 +53,7 @@
#include “SDL_wingl_c.h”

#ifdef _WIN32_WCE
+#define WS_THICKFRAME 0
#define NO_GETDIBITS
#define NO_CHANGEDISPLAYSETTINGS
#define NO_GAMMA_SUPPORT
Index: test/testtimer.c

RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/test/testtimer.c,v
retrieving revision 1.1.1.1
diff -n -a -u -r1.1.1.1 testtimer.c
— test/testtimer.c 26 Apr 2001 16:45:46 -0000 1.1.1.1
+++ test/testtimer.c 25 Nov 2003 17:30:12 -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”);


Sign-up for Ads Free at Mail.com
http://promo.mail.com/adsfreejump.htm

Quoting Andy Pfiffer :

Sam,

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.

It doesn’t break anything for me (eVC 4.0 SP2, PocketPC 2003).

btw, why not add the VisualCE directory to CVS, instead of putting it in a .zip
file? Same goes for VisualC, I guess. I know the rule of thumb is not to put
generated files in cvs, but these are a relatively simple text format.

-brad

btw, why not add the VisualCE directory to CVS, instead of putting it in a .zip
file? Same goes for VisualC, I guess. I know the rule of thumb is not to put
generated files in cvs, but these are a relatively simple text format.

The convention has been to keep build projects in their own archives so they
don’t clutter up the directory structure.

This has the nice side-effect of not automatically marking projects
as modified when building with a version of DevStudio newer than 5.0

See ya,
-Sam Lantinga, Software Engineer, Blizzard Entertainment

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

Thanks! I’ve applied them (almost unchanged) to CVS.

See ya,
-Sam Lantinga, Software Engineer, Blizzard Entertainment