From 6e309d8032330f87ed3bd1f7523b36a56677e756 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 14 Jul 2019 02:56:34 +0300 Subject: [PATCH] Build: Disable WASAPI on VB6 bindings build --- .appveyor.yml | 2 +- cmake/DownloadAudioCodecs.cmake | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 251f0f38..fb8c450f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,7 @@ environment: COMPILER_FAMILY: MinGW GENERATOR: "MinGW Makefiles" PLATFORM: Win32-VB6-Binding - EXTRA_CMAKE_FLAGS: "-DBUILD_AS_VB6_BINDING=ON" + EXTRA_CMAKE_FLAGS: "-DBUILD_AS_VB6_BINDING=ON -DWITH_SDL2_WASAPI=OFF" - BUILD_TYPE: Debug COMPILER: MinGW COMPILER_FAMILY: MinGW diff --git a/cmake/DownloadAudioCodecs.cmake b/cmake/DownloadAudioCodecs.cmake index df868c68..e30e7fad 100644 --- a/cmake/DownloadAudioCodecs.cmake +++ b/cmake/DownloadAudioCodecs.cmake @@ -17,11 +17,20 @@ find_package(Git REQUIRED) set(AUDIO_CODECS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(AUDIO_CODECS_REPOSITORY_PATH ${CMAKE_BINARY_DIR}/external/AudioCodecs) +option(WITH_SDL2_WASAPI "Enable WASAPI audio output support for Windows build of SDL2" ON) +if(WIN32) + set(SDL2_WASAPI_FLAG "-DSDL2_WASAPI_FLAG=${WITH_SDL2_WASAPI}") +endif() + ExternalProject_Add( AudioCodecs PREFIX ${CMAKE_BINARY_DIR}/external/AudioCodecs GIT_REPOSITORY https://github.com/WohlSoft/AudioCodecs.git - CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_INSTALL_PREFIX=${AUDIO_CODECS_INSTALL_DIR}" "-DDOWNLOAD_SDL2_DEPENDENCY=ON" + CMAKE_ARGS + "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + "-DCMAKE_INSTALL_PREFIX=${AUDIO_CODECS_INSTALL_DIR}" + "-DDOWNLOAD_SDL2_DEPENDENCY=ON" + ${SDL2_WASAPI_FLAG} ) message("AudioCodecs can see SDL2 is stored in ${SDL2_REPO_PATH}...")