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

[oss] moved detection to module

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

10
CMakeLists.txt
View File

@ -509,7 +509,6 @@ endif(APPLE)
# OpenBSD
if(OPENBSD)
set(WITH_MANPAGES "ON")
set(WITH_OSS "OFF")
set(WITH_SNDIO "ON")
set(WITH_WAYLAND "OFF")
endif()
@ -590,10 +589,6 @@ set(MBEDTLS_FEATURE_TYPE "OPTIONAL")
set(MBEDTLS_FEATURE_PURPOSE "cryptography")
set(MBEDTLS_FEATURE_DESCRIPTION "encryption, certificate validation, hashing functions")
set(OSS_FEATURE_TYPE "RECOMMENDED")
set(OSS_FEATURE_PURPOSE "sound")
set(OSS_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection")
set(SNDIO_FEATURE_TYPE "OPTIONAL")
set(SNDIO_FEATURE_PURPOSE "sound")
set(SNDIO_FEATURE_DESCRIPTION "OpenBSD audio input/output")
@ -648,7 +643,6 @@ set(SOXR_FEATURE_DESCRIPTION "SOX audio resample library")
if(WIN32)
set(WAYLAND_FEATURE_TYPE "DISABLED")
set(OSS_FEATURE_TYPE "DISABLED")
set(SNDIO_FEATURE_TYPE "DISABLED")
set(PCSC_FEATURE_TYPE "DISABLED")
set(FFMPEG_FEATURE_TYPE "OPTIONAL")
@ -659,7 +653,6 @@ if(APPLE)
set(FFMPEG_FEATURE_TYPE "OPTIONAL")
set(VAAPI_FEATURE_TYPE "DISABLED")
set(WAYLAND_FEATURE_TYPE "DISABLED")
set(OSS_FEATURE_TYPE "DISABLED")
set(SNDIO_FEATURE_TYPE "DISABLED")
if(IOS)
set(PCSC_FEATURE_TYPE "DISABLED")
@ -683,7 +676,6 @@ endif(UNIX AND NOT ANDROID)
if(ANDROID)
set(WAYLAND_FEATURE_TYPE "DISABLED")
set(OSS_FEATURE_TYPE "DISABLED")
set(SNDIO_FEATURE_TYPE "DISABLED")
set(PCSC_FEATURE_TYPE "DISABLED")
set(VAAPI_FEATURE_TYPE "DISABLED")
@ -694,8 +686,6 @@ find_feature(Wayland ${WAYLAND_FEATURE_TYPE} ${WAYLAND_FEATURE_PURPOSE} ${WAYLAN
find_feature(OpenSSL ${OPENSSL_FEATURE_TYPE} ${OPENSSL_FEATURE_PURPOSE} ${OPENSSL_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(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DESCRIPTION})
option(WITH_AAD "Compile with support for Azure AD authentication" ON)

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

@ -17,6 +17,8 @@
define_channel_client_subsystem("audin" "oss" "")
find_package(OSS REQUIRED)
set(${MODULE_PREFIX}_SRCS
audin_oss.c
)

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

@ -17,6 +17,8 @@
define_channel_client_subsystem("rdpsnd" "oss" "")
find_package(OSS REQUIRED)
set(${MODULE_PREFIX}_SRCS
rdpsnd_oss.c
)

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

@ -17,12 +17,15 @@
define_channel_client_subsystem("tsmf" "oss" "audio")
find_package(OSS REQUIRED)
set(${MODULE_PREFIX}_SRCS
tsmf_oss.c
)
set(${MODULE_PREFIX}_LIBS
winpr
${OSS_LIBRARIES}
)
include_directories(..)