diff --git a/AUTHORS b/AUTHORS index e8a1b8eb..564dcf4b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -40,3 +40,4 @@ lexander Yashin https://github.com/yashin-alexander Nils Duval https://github.com/nlsdvl JackRedstonia jackredstonia64@gmail.com David Bullock https://github.com/dwbullock +Daniel Berezin https://github.com/danman113 diff --git a/contrib/Configure.cmake b/contrib/Configure.cmake index bd68ab5d..ac9225f7 100644 --- a/contrib/Configure.cmake +++ b/contrib/Configure.cmake @@ -17,7 +17,7 @@ print_option_status (SOLOUD_BUILD_DEMOS "Build demos") option (SOLOUD_BACKEND_NULL "Set to ON for building NULL backend" ON) print_option_status (SOLOUD_BACKEND_NULL "NULL backend") -option (SOLOUD_BACKEND_SDL2 "Set to ON for building SDL2 backend" ON) +option (SOLOUD_BACKEND_SDL2 "Set to ON for building SDL2 backend" OFF) print_option_status (SOLOUD_BACKEND_SDL2 "SDL2 backend") option (SOLOUD_BACKEND_ALSA "Set to ON for building ALSA backend" OFF) @@ -38,5 +38,8 @@ print_option_status (SOLOUD_BACKEND_WINMM "WINMM backend") option (SOLOUD_BACKEND_WASAPI "Set to ON for building WASAPI backend" OFF) print_option_status (SOLOUD_BACKEND_WASAPI "WASAPI backend") +option (SOLOUD_BACKEND_MINIAUDIO "Set to ON for building MINIAUDIO backend" ON) +print_option_status (SOLOUD_BACKEND_MINIAUDIO "MINIAUDIO backend") + option (SOLOUD_GENERATE_GLUE "Set to ON for generating the Glue APIs" OFF) print_option_status (SOLOUD_GENERATE_GLUE "Generate Glue") diff --git a/contrib/src.cmake b/contrib/src.cmake index 831fe755..e040fd44 100644 --- a/contrib/src.cmake +++ b/contrib/src.cmake @@ -171,7 +171,7 @@ if (SOLOUD_BACKEND_ALSA) set (BACKENDS_SOURCES ${BACKENDS_SOURCES} ${BACKENDS_PATH}/alsa/soloud_alsa.cpp - ) + ) find_library (ALSA_LIBRARY asound) set (LINK_LIBRARIES @@ -244,6 +244,22 @@ if (SOLOUD_BACKEND_WASAPI) ) endif() + +if (SOLOUD_BACKEND_MINIAUDIO) + add_definitions (-DWITH_MINIAUDIO) + + set (BACKENDS_SOURCES + ${BACKENDS_SOURCES} + ${BACKENDS_PATH}/miniaudio/soloud_miniaudio.cpp + ) + + set (BACKENDS_SOURCES + ${BACKENDS_SOURCES} + ${BACKENDS_PATH}/miniaudio/miniaudio.h + ) + +endif() + # Filters set (FILTERS_PATH ${SOURCE_PATH}/filter) set (FILTERS_SOURCES