Mercurial > sdl-ios-xcode
view src/video/windx5/directx.h @ 1165:4fa705cdecb9
Date: Tue, 1 Nov 2005 02:51:09 +0000
From: Mike Frysinger <vapier@gentoo.org>
To: sdl@libsdl.org
Subject: Re: [SDL] libsdl needs some tweaks for DirectFB 0.9.23
On Fri, Oct 28, 2005 at 01:23:57AM +0000, Mike Frysinger wrote:
> the new release of DirectFB breaks the libsdl DirectRB video module
>
> specifically, this change:
> http://www.directfb.org/index.php/viewcvs.cgi/DirectFB/include/directfb.h.diff?r1=1.266&r2=1.267
>
> but (unless i missed something), it should be trivial to fix (just annoying)
> ... ive done so in Gentoo (also attached):
> http://viewcvs.gentoo.org/media-libs/libsdl/files/libsdl-1.2.9-DirectFB-updates.patch
hmm, i did miss something ... need to include directfb_version.h before trying
to test version defines :)
updated patch attached as well as previous URL
-mike
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Tue, 01 Nov 2005 04:18:08 +0000 |
parents | 35d9c8a5aa10 |
children | 450721ad5436 |
line wrap: on
line source
#ifndef _directx_h #define _directx_h /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */ #include <windows.h> #include <mmsystem.h> #ifndef WIN32 #define WIN32 #endif #undef WINNT /* Far pointers don't exist in 32-bit code */ #ifndef FAR #define FAR #endif /* Error codes not yet included in Win32 API header files */ #ifndef MAKE_HRESULT #define MAKE_HRESULT(sev,fac,code) \ ((HRESULT)(((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code)))) #endif #ifndef S_OK #define S_OK (HRESULT)0x00000000L #endif #ifndef SUCCEEDED #define SUCCEEDED(x) ((HRESULT)(x) >= 0) #endif #ifndef FAILED #define FAILED(x) ((HRESULT)(x)<0) #endif #ifndef E_FAIL #define E_FAIL (HRESULT)0x80000008L #endif #ifndef E_NOINTERFACE #define E_NOINTERFACE (HRESULT)0x80004002L #endif #ifndef E_OUTOFMEMORY #define E_OUTOFMEMORY (HRESULT)0x8007000EL #endif #ifndef E_INVALIDARG #define E_INVALIDARG (HRESULT)0x80070057L #endif #ifndef E_NOTIMPL #define E_NOTIMPL (HRESULT)0x80004001L #endif #ifndef REGDB_E_CLASSNOTREG #define REGDB_E_CLASSNOTREG (HRESULT)0x80040154L #endif /* Severity codes */ #ifndef SEVERITY_ERROR #define SEVERITY_ERROR 1 #endif /* Error facility codes */ #ifndef FACILITY_WIN32 #define FACILITY_WIN32 7 #endif #ifndef FIELD_OFFSET #define FIELD_OFFSET(type, field) ((LONG)&(((type *)0)->field)) #endif /* DirectX headers (if it isn't included, I haven't tested it yet) */ /* We need these defines to mark what version of DirectX API we use */ #define DIRECTDRAW_VERSION 0x0700 #define DIRECTSOUND_VERSION 0x0500 #define DIRECTINPUT_VERSION 0x0500 #ifdef __GNUC__ #define NONAMELESSUNION #endif #include <ddraw.h> #include <dsound.h> #include <dinput.h> #endif /* _directx_h */