Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added miniaudio backend to cmake contrib options #334

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ lexander Yashin https://github.com/yashin-alexander
Nils Duval https://github.com/nlsdvl
JackRedstonia [email protected]
David Bullock https://github.com/dwbullock
Daniel Berezin https://github.com/danman113
5 changes: 4 additions & 1 deletion contrib/Configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
18 changes: 17 additions & 1 deletion contrib/src.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ if (SOLOUD_BACKEND_ALSA)
set (BACKENDS_SOURCES
${BACKENDS_SOURCES}
${BACKENDS_PATH}/alsa/soloud_alsa.cpp
)
)
danman113 marked this conversation as resolved.
Show resolved Hide resolved

find_library (ALSA_LIBRARY asound)
set (LINK_LIBRARIES
Expand Down Expand Up @@ -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
Expand Down