mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[alsa] move detection to module

Browse Source
This commit is contained in:
akallabeth 2023-10-10 19:40:48 +02:00 committed by akallabeth
parent 80122c1784
commit f06c027824
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -509,7 +509,6 @@ endif(APPLE)
# OpenBSD # OpenBSD
if(OPENBSD) if(OPENBSD)
set(WITH_MANPAGES "ON") set(WITH_MANPAGES "ON")
set(WITH_ALSA "OFF")
set(WITH_PULSE "OFF") set(WITH_PULSE "OFF")
set(WITH_OSS "OFF") set(WITH_OSS "OFF")
set(WITH_SNDIO "ON") set(WITH_SNDIO "ON")
@ -596,10 +595,6 @@ set(OSS_FEATURE_TYPE "RECOMMENDED")
set(OSS_FEATURE_PURPOSE "sound") set(OSS_FEATURE_PURPOSE "sound")
set(OSS_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection") set(OSS_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection")
set(ALSA_FEATURE_TYPE "RECOMMENDED")
set(ALSA_FEATURE_PURPOSE "sound")
set(ALSA_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection")
set(SNDIO_FEATURE_TYPE "OPTIONAL") set(SNDIO_FEATURE_TYPE "OPTIONAL")
set(SNDIO_FEATURE_PURPOSE "sound") set(SNDIO_FEATURE_PURPOSE "sound")
set(SNDIO_FEATURE_DESCRIPTION "OpenBSD audio input/output") set(SNDIO_FEATURE_DESCRIPTION "OpenBSD audio input/output")
@ -659,7 +654,6 @@ set(SOXR_FEATURE_DESCRIPTION "SOX audio resample library")
if(WIN32) if(WIN32)
set(WAYLAND_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED")
set(OSS_FEATURE_TYPE "DISABLED") set(OSS_FEATURE_TYPE "DISABLED")
set(ALSA_FEATURE_TYPE "DISABLED")
set(SNDIO_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED")
set(PULSE_FEATURE_TYPE "DISABLED") set(PULSE_FEATURE_TYPE "DISABLED")
set(PCSC_FEATURE_TYPE "DISABLED") set(PCSC_FEATURE_TYPE "DISABLED")
@ -672,7 +666,6 @@ if(APPLE)
set(VAAPI_FEATURE_TYPE "DISABLED") set(VAAPI_FEATURE_TYPE "DISABLED")
set(WAYLAND_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED")
set(OSS_FEATURE_TYPE "DISABLED") set(OSS_FEATURE_TYPE "DISABLED")
set(ALSA_FEATURE_TYPE "DISABLED")
set(SNDIO_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED")
if(IOS) if(IOS)
set(PULSE_FEATURE_TYPE "DISABLED") set(PULSE_FEATURE_TYPE "DISABLED")
@ -698,7 +691,6 @@ endif(UNIX AND NOT ANDROID)
if(ANDROID) if(ANDROID)
set(WAYLAND_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED")
set(OSS_FEATURE_TYPE "DISABLED") set(OSS_FEATURE_TYPE "DISABLED")
set(ALSA_FEATURE_TYPE "DISABLED")
set(SNDIO_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED")
set(PULSE_FEATURE_TYPE "DISABLED") set(PULSE_FEATURE_TYPE "DISABLED")
set(PCSC_FEATURE_TYPE "DISABLED") set(PCSC_FEATURE_TYPE "DISABLED")
@ -711,7 +703,6 @@ find_feature(OpenSSL ${OPENSSL_FEATURE_TYPE} ${OPENSSL_FEATURE_PURPOSE} ${OPENSS
find_feature(MbedTLS ${MBEDTLS_FEATURE_TYPE} ${MBEDTLS_FEATURE_PURPOSE} ${MBEDTLS_FEATURE_DESCRIPTION}) find_feature(MbedTLS ${MBEDTLS_FEATURE_TYPE} ${MBEDTLS_FEATURE_PURPOSE} ${MBEDTLS_FEATURE_DESCRIPTION})
find_feature(OSS ${OSS_FEATURE_TYPE} ${OSS_FEATURE_PURPOSE} ${OSS_FEATURE_DESCRIPTION}) find_feature(OSS ${OSS_FEATURE_TYPE} ${OSS_FEATURE_PURPOSE} ${OSS_FEATURE_DESCRIPTION})
find_feature(ALSA ${ALSA_FEATURE_TYPE} ${ALSA_FEATURE_PURPOSE} ${ALSA_FEATURE_DESCRIPTION})
find_feature(Pulse ${PULSE_FEATURE_TYPE} ${PULSE_FEATURE_PURPOSE} ${PULSE_FEATURE_DESCRIPTION}) find_feature(Pulse ${PULSE_FEATURE_TYPE} ${PULSE_FEATURE_PURPOSE} ${PULSE_FEATURE_DESCRIPTION})
find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DESCRIPTION}) find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DESCRIPTION})

2
channels/audin/client/alsa/CMakeLists.txt
View File

@ -17,6 +17,8 @@
define_channel_client_subsystem("audin" "alsa" "") define_channel_client_subsystem("audin" "alsa" "")
find_package(ALSA REQUIRED)
set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_SRCS
audin_alsa.c audin_alsa.c
) )

2
channels/rdpsnd/client/alsa/CMakeLists.txt
View File

@ -17,6 +17,8 @@
define_channel_client_subsystem("rdpsnd" "alsa" "") define_channel_client_subsystem("rdpsnd" "alsa" "")
find_package(ALSA REQUIRED)
set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_SRCS
rdpsnd_alsa.c) rdpsnd_alsa.c)

3
channels/tsmf/client/alsa/CMakeLists.txt
View File

@ -17,6 +17,8 @@
define_channel_client_subsystem("tsmf" "alsa" "audio") define_channel_client_subsystem("tsmf" "alsa" "audio")
find_package(ALSA REQUIRED)
set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_SRCS
tsmf_alsa.c tsmf_alsa.c
) )
@ -24,6 +26,7 @@ set(${MODULE_PREFIX}_SRCS
set(${MODULE_PREFIX}_LIBS set(${MODULE_PREFIX}_LIBS
winpr winpr
freerdp freerdp
${ALSA_LIBRARIES}
) )
include_directories(..) include_directories(..)