valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Add sdl changes.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2973
This commit is contained in:
Peter Veenstra 2007-08-18 15:00:36 +00:00
parent 169cf5b3a7
commit 5230623ac2
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/platform/Makefile.am
View file

@ -1 +1,3 @@
SUBDIRS = visualc
SUBDIRS = visualc
EXTRA_DIST = sdl-win32.diff

55
src/platform/sdl-win32.diff Normal file
View file

@ -0,0 +1,55 @@
diff -ru SDL-1.2.12/src/main/win32/version.rc SDL-1.2.12release/src/main/win32/version.rc
--- SDL-1.2.12/src/main/win32/version.rc 2007-07-20 07:52:05.000000000 +0200
+++ SDL-1.2.12release/src/main/win32/version.rc 2007-08-17 19:03:42.000000000 +0200
@@ -13,7 +13,7 @@
FILEVERSION 1,2,12,0
PRODUCTVERSION 1,2,12,0
FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
+ FILEFLAGS 0x4L
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
diff -ru SDL-1.2.12/src/video/SDL_video.c SDL-1.2.12release/src/video/SDL_video.c
--- SDL-1.2.12/src/video/SDL_video.c 2007-07-20 07:52:25.000000000 +0200
+++ SDL-1.2.12release/src/video/SDL_video.c 2007-08-17 02:51:52.000000000 +0200
@@ -75,12 +75,12 @@
#if SDL_VIDEO_DRIVER_GAPI
&GAPI_bootstrap,
#endif
-#if SDL_VIDEO_DRIVER_WINDIB
- &WINDIB_bootstrap,
-#endif
#if SDL_VIDEO_DRIVER_DDRAW
&DIRECTX_bootstrap,
#endif
+#if SDL_VIDEO_DRIVER_WINDIB
+ &WINDIB_bootstrap,
+#endif
#if SDL_VIDEO_DRIVER_BWINDOW
&BWINDOW_bootstrap,
#endif
diff -ru SDL-1.2.12/src/video/windx5/SDL_dx5events.c SDL-1.2.12release/src/video/windx5/SDL_dx5events.c
--- SDL-1.2.12/src/video/windx5/SDL_dx5events.c 2007-07-20 07:52:25.000000000 +0200
+++ SDL-1.2.12release/src/video/windx5/SDL_dx5events.c 2007-08-17 02:51:52.000000000 +0200
@@ -519,7 +519,7 @@
case WM_SYSKEYDOWN: {
/* Pass syskey to DefWindwoProc (ALT-F4, etc.) */
}
- break;
+// break;
case WM_KEYUP:
case WM_KEYDOWN: {
/* Ignore windows keyboard messages */;
diff -ru SDL-1.2.12/src/video/windx5/SDL_dx5video.c SDL-1.2.12release/src/video/windx5/SDL_dx5video.c
--- SDL-1.2.12/src/video/windx5/SDL_dx5video.c 2007-07-20 07:52:25.000000000 +0200
+++ SDL-1.2.12release/src/video/windx5/SDL_dx5video.c 2007-08-17 02:51:52.000000000 +0200
@@ -1496,7 +1496,7 @@
}
}
dd_surface3 = NULL;
-#if 0 /* FIXME: enable this when SDL consistently reports lost surfaces */
+#if 1 /* FIXME: enable this when SDL consistently reports lost surfaces */
if ( (flags & SDL_HWSURFACE) == SDL_HWSURFACE ) {
video->flags |= SDL_HWSURFACE;
} else {