Mercurial > sdl-ios-xcode
view src/video/xbios/SDL_xbios_centscreen.c @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:04:13 +0000 |
parents | 6405314a7c07 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Centscreen extension definitions Patrice Mandin */ #include <mint/falcon.h> #include "SDL_xbios.h" #include "SDL_xbios_centscreen.h" int SDL_XBIOS_ListCentscreenModes(_THIS, int actually_add) { centscreen_mode_t curmode, listedmode; unsigned long result; int cur_handle; /* Current Centscreen mode handle */ /* Add Centscreen modes */ Vread(&curmode); cur_handle = curmode.handle; curmode.mode = curmode.physx = curmode.physy = curmode.plan = curmode.logx = curmode.logy = -1; result = Vfirst(&curmode, &listedmode); if (result==0) { while (result==0) { /* Don't add modes with virtual screen */ if ((listedmode.mode & CSCREEN_VIRTUAL)==0) { /* Don't add modes with bpp<8 */ if (listedmode.plan>=8) { xbiosmode_t modeinfo; modeinfo.number = listedmode.mode; modeinfo.width = listedmode.physx; modeinfo.height = listedmode.physy; modeinfo.depth = listedmode.plan; modeinfo.flags = (modeinfo.depth == 8 ? XBIOSMODE_C2P : 0); SDL_XBIOS_AddMode(this, actually_add, &modeinfo); } } SDL_memcpy(&curmode, &listedmode, sizeof(centscreen_mode_t)); curmode.mode = curmode.physx = curmode.physy = curmode.plan = curmode.logx = curmode.logy = -1; result = Vnext(&curmode, &listedmode); } } else { fprintf(stderr, "No suitable Centscreen modes\n"); } return cur_handle; } void SDL_XBIOS_CentscreenSetmode(_THIS, int width, int height, int planes) { centscreen_mode_t newmode, curmode; newmode.handle = newmode.mode = newmode.logx = newmode.logy = -1; newmode.physx = width; newmode.physy = height; newmode.plan = planes; Vwrite(0, &newmode, &curmode); #ifdef SDL_VIDEO_DISABLE_SCREENSAVER /* Disable screensaver */ Vread(&newmode); newmode.mode &= ~(CSCREEN_SAVER|CSCREEN_ENERGYSTAR); Vwrite(0, &newmode, &curmode); #endif /* SDL_VIDEO_DISABLE_SCREENSAVER */ } void SDL_XBIOS_CentscreenRestore(_THIS, int prev_handle) { centscreen_mode_t newmode, curmode; /* Restore old video mode */ newmode.handle = prev_handle; newmode.mode = newmode.physx = newmode.physy = newmode.plan = newmode.logx = newmode.logy = -1; Vwrite(0, &newmode, &curmode); }