changeset 1760:a9be6a3a51d1

Patch from Dmitry Yakimov to fix building on WinCE
author Sam Lantinga <slouken@libsdl.org>
date Wed, 03 May 2006 04:11:38 +0000
parents 724cca1bda2d
children 39715a34a0be
files VisualCE.zip include/SDL_syswm.h src/events/SDL_keyboard.c test/testwin.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
Binary file VisualCE.zip has changed
--- a/include/SDL_syswm.h	Tue May 02 15:18:07 2006 +0000
+++ b/include/SDL_syswm.h	Wed May 03 04:11:38 2006 +0000
@@ -115,7 +115,7 @@
 	GR_WINDOW_ID window ;	/* The display window */
 } SDL_SysWMinfo;
 
-#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW)
+#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
--- a/src/events/SDL_keyboard.c	Tue May 02 15:18:07 2006 +0000
+++ b/src/events/SDL_keyboard.c	Wed May 03 04:11:38 2006 +0000
@@ -59,7 +59,7 @@
 
 	/* Initialize the tables */
 	SDL_ModState = KMOD_NONE;
-	SDL_memset(keynames, 0, sizeof(keynames));
+	SDL_memset((void*)keynames, 0, sizeof(keynames));
 	SDL_memset(SDL_KeyState, 0, sizeof(SDL_KeyState));
 	video->InitOSKeymap(this);
 
--- a/test/testwin.c	Tue May 02 15:18:07 2006 +0000
+++ b/test/testwin.c	Wed May 03 04:11:38 2006 +0000
@@ -250,9 +250,9 @@
 	delay = 1;
 
 #ifdef _WIN32_WCE
-	w = 640;
+	w = 240;
 	h = 320;
-	desired_bpp = 0;
+	desired_bpp = 8;
 	video_flags = SDL_FULLSCREEN;
 #else
 	w = 640;