diff options
| -rw-r--r-- | Alc/ALc.c | 34 | ||||
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | config.h.in | 9 |
3 files changed, 24 insertions, 29 deletions
@@ -20,29 +20,23 @@ #include "config.h" -#ifndef HAVE_LIBUUID -#ifdef HAVE_MMDEVAPI +#if defined(HAVE_GUIDDEF_H) || defined(HAVE_INITGUID_H) #define INITGUID -#include <mmdeviceapi.h> -#include <audioclient.h> -#include <cguid.h> -#include <mmreg.h> -#ifndef _WAVEFORMATEXTENSIBLE_ -#include <ks.h> -#include <ksmedia.h> -#endif +#include <windows.h> +#ifdef HAVE_GUIDDEF_H +#include <guiddef.h> +#else +#include <initguid.h> #endif -#ifdef HAVE_DSOUND -#define INITGUID -#include <dsound.h> -#include <cguid.h> -#include <mmreg.h> -#ifndef _WAVEFORMATEXTENSIBLE_ -#include <ks.h> -#include <ksmedia.h> -#endif -#endif +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +DEFINE_GUID(CLSID_MMDeviceEnumerator, 0xbcde0395, 0xe52f, 0x467c, 0x8e,0x3d, 0xc4,0x57,0x92,0x91,0x69,0x2e); +DEFINE_GUID(IID_IMMDeviceEnumerator, 0xa95664d2, 0x9614, 0x4f35, 0xa7,0x46, 0xde,0x8d,0xb6,0x36,0x17,0xe6); +DEFINE_GUID(IID_IAudioClient, 0x1cb9ad4c, 0xdbfa, 0x4c32, 0xb1,0x78, 0xc2,0xf5,0x68,0xa7,0x03,0xb2); +DEFINE_GUID(IID_IAudioRenderClient, 0xf294acfc, 0x3146, 0x4483, 0xa7,0xbf, 0xad,0xdc,0xa7,0xc2,0x60,0xe2); + #endif #include <math.h> diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b3e93f3..25e9ce24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,10 @@ CHECK_C_SOURCE_COMPILES("int foo(const char *str, ...) __attribute__((format(pri CHECK_INCLUDE_FILE(fenv.h HAVE_FENV_H) CHECK_INCLUDE_FILE(float.h HAVE_FLOAT_H) +CHECK_INCLUDE_FILE(guiddef.h HAVE_GUIDDEF_H) +IF(NOT HAVE_GUIDDEF_H) + CHECK_INCLUDE_FILE(initguid.h HAVE_INITGUID_H) +ENDIF() CHECK_LIBRARY_EXISTS(m powf "" HAVE_POWF) CHECK_LIBRARY_EXISTS(m sqrtf "" HAVE_SQRTF) @@ -338,12 +342,6 @@ IF(HAVE_LIBWINMM) ENDIF() -CHECK_LIBRARY_EXISTS(uuid CLSID_MMDeviceEnumerator "" HAVE_LIBUUID) -IF(HAVE_LIBUUID) - SET(EXTRA_LIBS uuid ${EXTRA_LIBS}) -ENDIF() - - SET(OPENAL_OBJS OpenAL32/alAuxEffectSlot.c OpenAL32/alBuffer.c OpenAL32/alDatabuffer.c diff --git a/config.h.in b/config.h.in index b1a4cde4..7b2c257c 100644 --- a/config.h.in +++ b/config.h.in @@ -86,6 +86,12 @@ /* Define if we have pthread_np.h */ #cmakedefine HAVE_PTHREAD_NP_H +/* Define if we have guiddef.h */ +#cmakedefine HAVE_GUIDDEF_H + +/* Define if we have guiddef.h */ +#cmakedefine HAVE_INITGUID_H + /* Define if we have float.h */ #cmakedefine HAVE_FLOAT_H @@ -106,6 +112,3 @@ /* Define if we have the __restrict keyword */ #cmakedefine HAVE___RESTRICT - -/* Define if we have libuuid */ -#cmakedefine HAVE_LIBUUID |