Mercurial > sdl-ios-xcode
view src/video/xbios/SDL_xbios_blowup.h @ 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 | 05c9e942cc46 |
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" /* Blowup extension definitions Patrice Mandin */ #ifndef _SDL_xbios_blowup_h #define _SDL_xbios_blowup_h #include "SDL_xbios.h" /*--- Types ---*/ typedef struct { /* 64 bytes */ unsigned short enabled; /* Extended mode enabled ? 0=yes, <>0=no */ unsigned short dummy10[6]; unsigned short registers_0E; /* value for register 0xffff820e */ unsigned short registers_10; /* value for register 0xffff8210 */ unsigned short dummy11[23]; /* 64 bytes */ unsigned short width; /* width-1 */ unsigned short height; /* height-1 */ unsigned short dummy20; unsigned long screensize; /* screensize in bytes */ unsigned short dummy21[8]; unsigned short virtual; /* Virtual screen ? */ unsigned short virwidth; /* Virtual screen width */ unsigned short virheight; /* Virtual screen height */ unsigned short dummy22; unsigned short monitor; /* Monitor defined for this mode */ unsigned short extension; /* Extended mode defined ? 0=yes, 1=no */ unsigned short dummy23[13]; /* 64 bytes */ unsigned short dummy30; unsigned short registers_82[6]; /* values for registers 0xffff8282-8c */ unsigned short dummy31[9]; unsigned short dummy32; unsigned short registers_A2[6]; /* values for registers 0xffff82a2-ac */ unsigned short dummy33[9]; /* 64 bytes */ unsigned short registers_C0; /* value for register 0xffff82c0 */ unsigned short registers_C2; /* value for register 0xffff82c2 */ unsigned short dummy40[30]; } __attribute__((packed)) blow_mode_t; typedef struct { blow_mode_t blowup_modes[10]; unsigned char num_mode[6]; unsigned long dummy; unsigned short montype; } __attribute__((packed)) blow_cookie_t; /*--- Functions prototypes ---*/ void SDL_XBIOS_ListBlowupModes(_THIS, int actually_add, blow_cookie_t *cookie_blow); #endif /* _SDL_xbios_blowup_h */