Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Fixed compiling on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Feb 11, 2011
1 parent f266274 commit 1fa469b
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 40 deletions.
12 changes: 0 additions & 12 deletions VisualC/SDL/SDL_VS2008.vcproj
View file
Expand Up @@ -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"
>
Expand Down Expand Up @@ -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"
>
Expand Down
3 changes: 0 additions & 3 deletions VisualC/SDL/SDL_VS2010.vcxproj
View file
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
12 changes: 0 additions & 12 deletions VisualCE/SDL/SDL.vcproj
View file
Expand Up @@ -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"
>
Expand Down Expand Up @@ -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"
>
Expand Down Expand Up @@ -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"
>
Expand Down
2 changes: 1 addition & 1 deletion src/SDL_compat.c
View file
Expand Up @@ -79,7 +79,7 @@ GetVideoDisplay()
variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
}
if ( variable ) {
SDL_atoi(variable);
return SDL_atoi(variable);
} else {
return 0;
}
Expand Down
3 changes: 0 additions & 3 deletions src/video/SDL_video.c
View file
Expand Up @@ -1004,7 +1004,6 @@ Uint32
SDL_GetWindowPixelFormat(SDL_Window * window)
{
SDL_VideoDisplay *display;
SDL_DisplayMode *displayMode;

CHECK_WINDOW_MAGIC(window, SDL_PIXELFORMAT_UNKNOWN);

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -1269,7 +1267,6 @@ SDL_Window *
SDL_GetWindowFromID(Uint32 id)
{
SDL_Window *window;
int i;

if (!_this) {
return NULL;
Expand Down
10 changes: 3 additions & 7 deletions src/video/windows/SDL_windowsclipboard.c
View file
Expand Up @@ -37,15 +37,11 @@
static HWND
GetWindowHandle(_THIS)
{
SDL_VideoDisplay *display;
SDL_Window *window;

display = _this->displays;
if (display) {
window = display->windows;
if (window) {
return ((SDL_WindowData *) window->driverdata)->hwnd;
}
window = _this->windows;
if (window) {
return ((SDL_WindowData *) window->driverdata)->hwnd;
}
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/video/windows/SDL_windowsmodes.c 100644 → 100755
View file
Expand Up @@ -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;
Expand Down

0 comments on commit 1fa469b

Please sign in to comment.