Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio_stfa.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 | a1b03ba2fcd0 |
| 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" /* STFA control structure Patrice Mandin */ #ifndef _SDL_mintaudio_stfa_h #define _SDL_mintaudio_stfa_h /*--- Defines ---*/ #define C_STFA 0x53544641L /* Sound treiber für atari (seb/The removers) */ #define STFA_PLAY_ENABLE (1<<0) #define STFA_PLAY_DISABLE (0<<0) #define STFA_PLAY_REPEAT (1<<1) #define STFA_PLAY_SINGLE (0<<1) #define STFA_FORMAT_SIGNED (1<<15) #define STFA_FORMAT_UNSIGNED (0<<15) #define STFA_FORMAT_STEREO (1<<14) #define STFA_FORMAT_MONO (0<<14) #define STFA_FORMAT_16BIT (1<<13) #define STFA_FORMAT_8BIT (0<<13) #define STFA_FORMAT_LITENDIAN (1<<9) #define STFA_FORMAT_BIGENDIAN (0<<9) #define STFA_FORMAT_FREQ_MASK 0x0f enum { STFA_FORMAT_F4995=0, STFA_FORMAT_F6269, STFA_FORMAT_F7493, STFA_FORMAT_F8192, STFA_FORMAT_F9830, STFA_FORMAT_F10971, STFA_FORMAT_F12538, STFA_FORMAT_F14985, STFA_FORMAT_F16384, STFA_FORMAT_F19819, STFA_FORMAT_F21943, STFA_FORMAT_F24576, STFA_FORMAT_F30720, STFA_FORMAT_F32336, STFA_FORMAT_F43885, STFA_FORMAT_F49152 }; /*--- Types ---*/ typedef struct { unsigned short sound_enable; unsigned short sound_control; unsigned short sound_output; unsigned long sound_start; unsigned long sound_current; unsigned long sound_end; unsigned short version; void *old_vbl; void *old_timera; unsigned long old_mfp_status; void *new_vbl; void *drivers_list; void *play_stop; unsigned short frequency; void *set_frequency; unsigned short frequency_threshold; unsigned short *custom_freq_table; unsigned short stfa_on_off; void *new_drivers_list; unsigned long old_bit_2_of_cookie_snd; void (*stfa_it)(void); } cookie_stfa_t __attribute__((packed)); #endif /* _SDL_mintaudio_stfa_h */