Skip to content

Commit

Permalink
Build: Disable WASAPI on VB6 bindings build
Browse files Browse the repository at this point in the history
  • Loading branch information
Wohlstand committed Jul 13, 2019
1 parent 13a51bc commit 6e309d8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 10 additions & 1 deletion cmake/DownloadAudioCodecs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}...")

0 comments on commit 6e309d8

Please sign in to comment.