Mercurial > mxe-octave
changeset 1614:a0459f665f32
package openal: fix dsound static linking
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Fri, 04 Mar 2011 01:25:40 +1100 |
| parents | da0f6296bd2d |
| children | 0ea7263be430 |
| files | src/openal-2-guid-static-link.patch |
| diffstat | 1 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openal-2-guid-static-link.patch Fri Mar 04 01:25:40 2011 +1100 @@ -0,0 +1,27 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: + + +--- openal-soft-1.13.orig/Alc/dsound.c 2011-02-08 01:44:06.000000000 -0500 ++++ openal-soft-1.13/Alc/dsound.c 2011-03-02 22:57:58.000000000 -0500 +@@ -21,7 +21,6 @@ + #include "config.h" + + #define _WIN32_WINNT 0x0500 +-#define INITGUID + #include <stdlib.h> + #include <stdio.h> + #include <memory.h> +@@ -45,8 +44,8 @@ + #define DSSPEAKER_7POINT1 7 + #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); ++const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010,{0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; ++const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + + static void *ds_handle; + static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);