We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] cmake fixes

wasapi-cmake-fixes.diff (text/plain), 1.73 KB, created by Martin Gerhardy on 2017-02-15 13:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Gerhardy

Created: 2017-02-15 13:19:15 UTC

Size: 1.73 KB

patch

obsolete

>diff --git a/contrib/libs/sdl2/CMakeLists.txt b/contrib/libs/sdl2/CMakeLists.txt
>index cc908ac0..317cad6f 100644
>--- a/contrib/libs/sdl2/CMakeLists.txt
>+++ b/contrib/libs/sdl2/CMakeLists.txt
>@@ -1043,6 +1043,7 @@ elseif(WINDOWS)
>     check_include_file(dsound.h HAVE_DSOUND_H)
>     check_include_file(dinput.h HAVE_DINPUT_H)
>     check_include_file(xaudio2.h HAVE_XAUDIO2_H)
>+    check_include_file(audioclient.h HAVE_AUDIOCLIENT_H)
>     check_include_file(dxgi.h HAVE_DXGI_H)
>     if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H OR HAVE_XAUDIO2_H)
>       set(HAVE_DIRECTX TRUE)
>@@ -1072,6 +1073,12 @@ elseif(WINDOWS)
>       file(GLOB XAUDIO2_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/xaudio2/*.c)
>       set(SOURCE_FILES ${SOURCE_FILES} ${XAUDIO2_AUDIO_SOURCES})
>     endif()
>+
>+    if(HAVE_AUDIOCLIENT_H)
>+      set(SDL_AUDIO_DRIVER_WASAPI 1)
>+      file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c)
>+      set(SOURCE_FILES ${SOURCE_FILES} ${WASAPI_AUDIO_SOURCES})
>+    endif()
>   endif()
> 
>   if(SDL_VIDEO)
>diff --git a/contrib/libs/sdl2/include/SDL_config.h.cmake b/contrib/libs/sdl2/include/SDL_config.h.cmake
>index 2c145040..7c82e528 100644
>--- a/contrib/libs/sdl2/include/SDL_config.h.cmake
>+++ b/contrib/libs/sdl2/include/SDL_config.h.cmake
>@@ -215,6 +215,7 @@
> #cmakedefine SDL_AUDIO_DRIVER_DISK @SDL_AUDIO_DRIVER_DISK@
> #cmakedefine SDL_AUDIO_DRIVER_DUMMY @SDL_AUDIO_DRIVER_DUMMY@
> #cmakedefine SDL_AUDIO_DRIVER_XAUDIO2 @SDL_AUDIO_DRIVER_XAUDIO2@
>+#cmakedefine SDL_AUDIO_DRIVER_WASAPI @SDL_AUDIO_DRIVER_WASAPI@
> #cmakedefine SDL_AUDIO_DRIVER_DSOUND @SDL_AUDIO_DRIVER_DSOUND@
> #cmakedefine SDL_AUDIO_DRIVER_ESD @SDL_AUDIO_DRIVER_ESD@
> #cmakedefine SDL_AUDIO_DRIVER_ESD_DYNAMIC @SDL_AUDIO_DRIVER_ESD_DYNAMIC@

Actions: View | Diff

Attachments on bug 3588: 2699

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.