Mercurial > sdl-ios-xcode

comparison src/audio/windx5/directx.h @ 4427:eada7e321df6 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bb6839704ed6
children 134c6707b767
comparison
equal deleted inserted replaced
4422:e5bdd0a79e5e 4427:eada7e321df6
1 1
2 #ifndef _directx_h 2 #ifndef _directx_h
3 #define _directx_h 3 #define _directx_h
4
5 #ifdef __GNUC__
6 #define NONAMELESSUNION
7 #endif
4 8
5 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */ 9 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
6 10
7 #define WIN32_LEAN_AND_MEAN 11 #define WIN32_LEAN_AND_MEAN
8 #include <windows.h> 12 #include <windows.h>
72 /* We need these defines to mark what version of DirectX API we use */ 76 /* We need these defines to mark what version of DirectX API we use */
73 #define DIRECTDRAW_VERSION 0x0700 77 #define DIRECTDRAW_VERSION 0x0700
74 #define DIRECTSOUND_VERSION 0x0500 78 #define DIRECTSOUND_VERSION 0x0500
75 #define DIRECTINPUT_VERSION 0x0500 79 #define DIRECTINPUT_VERSION 0x0500
76 80
77 #ifdef __GNUC__
78 #define NONAMELESSUNION
79 #endif
80 #include <ddraw.h> 81 #include <ddraw.h>
81 #include <dsound.h> 82 #include <dsound.h>
82 #include <dinput.h> 83 #include <dinput.h>
83 84
84 #endif /* _directx_h */ 85 #endif /* _directx_h */