diff --git a/src/audio/windx5/Makefile.am b/src/audio/windx5/Makefile.am index 3f176de9a..5e8e55697 100644 --- a/src/audio/windx5/Makefile.am +++ b/src/audio/windx5/Makefile.am @@ -6,4 +6,5 @@ libaudio_windx5_la_SOURCES = $(SRCS) # The SDL audio driver sources SRCS = SDL_dx5audio.c \ - SDL_dx5audio.h + SDL_dx5audio.h \ + directx.h diff --git a/src/audio/windx5/directx.h b/src/audio/windx5/directx.h new file mode 100644 index 000000000..0debe73b8 --- /dev/null +++ b/src/audio/windx5/directx.h @@ -0,0 +1,83 @@ + +#ifndef _directx_h +#define _directx_h + +/* Include all of the DirectX 5.0 headers and adds any necessary tweaks */ + +#include +#include +#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 +#include +#include + +#endif /* _directx_h */