Skip to content

L
libSDL
Commit 59203691 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Fixed compiling on Windows CE

parent 1667e9cf
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 62 deletions
VisualCE/SDL/SDL.vcproj
View file @ 59203691
...@@ -737,10 +737,6 @@ ...@@ -737,10 +737,6 @@
RelativePath="..\..\src\SDL.c" RelativePath="..\..\src\SDL.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_alphamult.c"
>
</File>
<File <File
RelativePath="..\..\src\SDL_assert.c" RelativePath="..\..\src\SDL_assert.c"
> >
...@@ -766,19 +762,15 @@ ...@@ -766,19 +762,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendfillrect.c" RelativePath="..\..\src\render\software\SDL_blendfillrect.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_blendline.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendpoint.c" RelativePath="..\..\src\render\software\SDL_blendline.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendrect.c" RelativePath="..\..\src\render\software\SDL_blendpoint.c"
> >
</File> </File>
<File <File
...@@ -817,10 +809,6 @@ ...@@ -817,10 +809,6 @@
RelativePath="..\..\src\video\SDL_bmp.c" RelativePath="..\..\src\video\SDL_bmp.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_ceddrawrender.c"
>
</File>
<File <File
RelativePath="..\..\src\video\SDL_clipboard.c" RelativePath="..\..\src\video\SDL_clipboard.c"
> >
...@@ -837,10 +825,6 @@ ...@@ -837,10 +825,6 @@
RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c" RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_d3drender.c"
>
</File>
<File <File
RelativePath="..\..\src\audio\windib\SDL_dibaudio.c" RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
> >
...@@ -850,15 +834,11 @@ ...@@ -850,15 +834,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_drawline.c" RelativePath="..\..\src\render\software\SDL_drawline.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_drawpoint.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_drawrect.c" RelativePath="..\..\src\render\software\SDL_drawpoint.c"
> >
</File> </File>
<File <File
...@@ -885,14 +865,6 @@ ...@@ -885,14 +865,6 @@
RelativePath="..\..\src\video\SDL_gamma.c" RelativePath="..\..\src\video\SDL_gamma.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_gapirender.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_gdirender.c"
>
</File>
<File <File
RelativePath="..\..\src\events\SDL_gesture.c" RelativePath="..\..\src\events\SDL_gesture.c"
> >
...@@ -934,7 +906,7 @@ ...@@ -934,7 +906,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullrender.c" RelativePath="..\..\src\video\dummy\SDL_nullframebuffer.c"
> >
</File> </File>
<File <File
...@@ -962,7 +934,11 @@ ...@@ -962,7 +934,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_renderer_sw.c" RelativePath="..\..\src\render\SDL_render.c"
>
</File>
<File
RelativePath="..\..\src\render\software\SDL_renderer_sw.c"
> >
</File> </File>
<File <File
...@@ -1065,6 +1041,10 @@ ...@@ -1065,6 +1041,10 @@
RelativePath="..\..\src\video\windows\SDL_windowsevents.c" RelativePath="..\..\src\video\windows\SDL_windowsevents.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.c"
>
</File>
<File <File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.c" RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
> >
...@@ -1098,11 +1078,11 @@ ...@@ -1098,11 +1078,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_mmx.c" RelativePath="..\..\src\render\SDL_yuv_mmx.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_sw.c" RelativePath="..\..\src\render\SDL_yuv_sw.c"
> >
</File> </File>
<File <File
...@@ -1131,7 +1111,7 @@ ...@@ -1131,7 +1111,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\mmx.h" RelativePath="..\..\src\render\mmx.h"
> >
</File> </File>
<File <File
...@@ -1150,10 +1130,6 @@ ...@@ -1150,10 +1130,6 @@
RelativePath="..\..\src\events\scancodes_xfree86.h" RelativePath="..\..\src\events\scancodes_xfree86.h"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_alphamult.h"
>
</File>
<File <File
RelativePath="..\..\src\SDL_assert_c.h" RelativePath="..\..\src\SDL_assert_c.h"
> >
...@@ -1171,71 +1147,71 @@ ...@@ -1171,71 +1147,71 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit.h" RelativePath="..\..\src\render\software\SDL_blendfillrect.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_auto.h" RelativePath="..\..\src\render\software\SDL_blendline.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_copy.h" RelativePath="..\..\src\render\software\SDL_blendpoint.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_slow.h" RelativePath="..\..\src\video\SDL_blit.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_ceddrawrender.h" RelativePath="..\..\src\video\SDL_blit_auto.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h" RelativePath="..\..\src\video\SDL_blit_copy.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_d3drender.h" RelativePath="..\..\src\video\SDL_blit_slow.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\windib\SDL_dibaudio.h" RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\disk\SDL_diskaudio.h" RelativePath="..\..\src\audio\windib\SDL_dibaudio.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_draw.h" RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.h" RelativePath="..\..\src\render\software\SDL_draw.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\SDL_error_c.h" RelativePath="..\..\src\render\software\SDL_drawline.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\events\SDL_events_c.h" RelativePath="..\..\src\render\software\SDL_drawpoint.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\SDL_fatal.h" RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_gapirender.h" RelativePath="..\..\src\SDL_error_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_gapirender_c.h" RelativePath="..\..\src\events\SDL_events_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_gdirender.h" RelativePath="..\..\src\SDL_fatal.h"
> >
</File> </File>
<File <File
...@@ -1279,7 +1255,7 @@ ...@@ -1279,7 +1255,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h" RelativePath="..\..\src\video\dummy\SDL_nullframebuffer_c.h"
> >
</File> </File>
<File <File
...@@ -1295,7 +1271,7 @@ ...@@ -1295,7 +1271,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_renderer_sw.h" RelativePath="..\..\src\render\software\SDL_renderer_sw_c.h"
> >
</File> </File>
<File <File
...@@ -1322,6 +1298,10 @@ ...@@ -1322,6 +1298,10 @@
RelativePath="..\..\src\joystick\SDL_sysjoystick.h" RelativePath="..\..\src\joystick\SDL_sysjoystick.h"
> >
</File> </File>
<File
RelativePath="..\..\src\render\SDL_sysrender.h"
>
</File>
<File <File
RelativePath="..\..\src\thread\SDL_systhread.h" RelativePath="..\..\src\thread\SDL_systhread.h"
> >
...@@ -1374,6 +1354,10 @@ ...@@ -1374,6 +1354,10 @@
RelativePath="..\..\src\video\windows\SDL_windowsevents.h" RelativePath="..\..\src\video\windows\SDL_windowsevents.h"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.h"
>
</File>
<File <File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.h" RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
> >
...@@ -1407,7 +1391,7 @@ ...@@ -1407,7 +1391,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_sw_c.h" RelativePath="..\..\src\render\SDL_yuv_sw_c.h"
> >
</File> </File>
<File <File
......
src/video/windows/SDL_windowsframebuffer.c
View file @ 59203691
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
#ifndef _WIN32_WCE
#define HAVE_GETDIBITS #define HAVE_GETDIBITS
#endif
int WIN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch) int WIN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch)
{ {
......
src/video/windows/SDL_windowswindow.c
View file @ 59203691
...@@ -454,6 +454,36 @@ WIN_SetWindowSize(_THIS, SDL_Window * window) ...@@ -454,6 +454,36 @@ WIN_SetWindowSize(_THIS, SDL_Window * window)
SetWindowPos(hwnd, top, 0, 0, w, h, (SWP_NOCOPYBITS | SWP_NOMOVE)); SetWindowPos(hwnd, top, 0, 0, w, h, (SWP_NOCOPYBITS | SWP_NOMOVE));
} }
#ifdef _WIN32_WCE
void WINCE_ShowWindow(_THIS, SDL_Window* window, int visible)
{
SDL_WindowData* windowdata = (SDL_WindowData*) window->driverdata;
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
if(visible) {
if(window->flags & SDL_WINDOW_FULLSCREEN) {
if(videodata->SHFullScreen)
videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE);
}
ShowWindow(windowdata->hwnd, SW_SHOW);
SetForegroundWindow(windowdata->hwnd);
} else {
ShowWindow(windowdata->hwnd, SW_HIDE);
if(window->flags & SDL_WINDOW_FULLSCREEN) {
if(videodata->SHFullScreen)
videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW);
}
}
}
#endif /* _WIN32_WCE */
void void
WIN_ShowWindow(_THIS, SDL_Window * window) WIN_ShowWindow(_THIS, SDL_Window * window)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment