pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiling on Windows

Browse source
This commit is contained in:
Sam Lantinga 2011-02-11 10:13:30 -08:00
parent 9560b718a2
commit b26aaee0f2
7 changed files with 6 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
VisualC/SDL/SDL_VS2008.vcproj
View file

@ -866,10 +866,6 @@
RelativePath="..\..\src\video\SDL_fillrect.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_gamma.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_gesture.c"
>
@ -1234,14 +1230,6 @@
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.h"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
>

3
VisualC/SDL/SDL_VS2010.vcxproj
View file

@ -341,7 +341,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClInclude Include="..\..\src\video\windows\SDL_windowsclipboard.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsevents.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsframebuffer.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsgamma.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowskeyboard.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsmodes.h" />
<ClInclude Include="..\..\src\video\windows\SDL_windowsmouse.h" />
@ -417,7 +416,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClCompile Include="..\..\src\events\SDL_events.c" />
<ClCompile Include="..\..\src\SDL_fatal.c" />
<ClCompile Include="..\..\src\video\SDL_fillrect.c" />
<ClCompile Include="..\..\src\video\SDL_gamma.c" />
<ClCompile Include="..\..\src\stdlib\SDL_getenv.c" />
<ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
<ClCompile Include="..\..\src\stdlib\SDL_iconv.c" />
@ -457,7 +455,6 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsgamma.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
<ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />

12
VisualCE/SDL/SDL.vcproj
View file

@ -861,10 +861,6 @@
RelativePath="..\..\src\video\SDL_fillrect.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_gamma.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_gesture.c"
>
@ -1053,10 +1049,6 @@
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
>
@ -1398,10 +1390,6 @@
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.h"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
>

2
src/SDL_compat.c
View file

@ -79,7 +79,7 @@ GetVideoDisplay()
variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
}
if ( variable ) {
SDL_atoi(variable);
return SDL_atoi(variable);
} else {
return 0;
}

3
src/video/SDL_video.c
View file

@ -1004,7 +1004,6 @@ Uint32
SDL_GetWindowPixelFormat(SDL_Window * window)
{
SDL_VideoDisplay *display;
SDL_DisplayMode *displayMode;
CHECK_WINDOW_MAGIC(window, SDL_PIXELFORMAT_UNKNOWN);
@ -1097,7 +1096,6 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
SDL_WINDOW_BORDERLESS |
SDL_WINDOW_RESIZABLE |
SDL_WINDOW_INPUT_GRABBED);
SDL_VideoDisplay *display;
SDL_Window *window;
if (!_this) {
@ -1269,7 +1267,6 @@ SDL_Window *
SDL_GetWindowFromID(Uint32 id)
{
SDL_Window *window;
int i;
if (!_this) {
return NULL;

6
src/video/windows/SDL_windowsclipboard.c
View file

@ -37,16 +37,12 @@
static HWND
GetWindowHandle(_THIS)
{
SDL_VideoDisplay *display;
SDL_Window *window;
display = _this->displays;
if (display) {
window = display->windows;
window = _this->windows;
if (window) {
return ((SDL_WindowData *) window->driverdata)->hwnd;
}
}
return NULL;
}

4
src/video/windows/SDL_windowsmodes.c Normal file → Executable file
View file

@ -217,8 +217,8 @@ WIN_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
// WINCE: DEVMODE.dmPosition not found, or may be mingw32ce bug
rect->x = 0;
rect->y = 0;
rect->w = display->windows->w;
rect->h = display->windows->h;
rect->w = _this->windows->w;
rect->h = _this->windows->h;
#else
rect->x = (int)data->DeviceMode.dmPosition.x;
rect->y = (int)data->DeviceMode.dmPosition.y;