diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake index c40e93a0a..5252e375b 100644 --- a/cmake/ConfigOptions.cmake +++ b/cmake/ConfigOptions.cmake @@ -106,6 +106,7 @@ option(WITH_DEBUG_RDP "Print RDP debug messages" ${DEFAULT_DEBUG_OPTION}) option(WITH_DEBUG_REDIR "Redirection debug messages" ${DEFAULT_DEBUG_OPTION}) option(WITH_DEBUG_RFX "Print RemoteFX debug messages." ${DEFAULT_DEBUG_OPTION}) option(WITH_DEBUG_SCARD "Print smartcard debug messages" ${DEFAULT_DEBUG_OPTION}) +option(WITH_DEBUG_SND "Print rdpsnd debug messages" ${DEFAULT_DEBUG_OPTION}) option(WITH_DEBUG_SVC "Print static virtual channel debug messages." ${DEFAULT_DEBUG_OPTION}) option(WITH_DEBUG_TRANSPORT "Print transport debug messages." ${DEFAULT_DEBUG_OPTION}) option(WITH_DEBUG_TIMEZONE "Print timezone debug messages." ${DEFAULT_DEBUG_OPTION}) diff --git a/cmake/ConfigOptionsAndroid.cmake b/cmake/ConfigOptionsAndroid.cmake index aa00fac5b..2706e054b 100644 --- a/cmake/ConfigOptionsAndroid.cmake +++ b/cmake/ConfigOptionsAndroid.cmake @@ -21,6 +21,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") endif() option(WITH_DEBUG_ANDROID_JNI "Enable debug output for android jni bindings" ${DEFAULT_DEBUG_OPTION}) +option(WITH_OPENSLES "Enable sound and microphone redirection using OpenSLES" ON) option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends on CMAKE_BUILD_TYPE" ON) option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT}) diff --git a/config.h.in b/config.h.in index bbbe36102..870de56d8 100755 --- a/config.h.in +++ b/config.h.in @@ -45,6 +45,13 @@ #cmakedefine WITH_WIN8 #cmakedefine WITH_RDPSND_DSOUND +#cmakedefine WITH_WINMM +#cmakedefine WITH_MACAUDIO +#cmakedefine WITH_ALSA +#cmakedefine WITH_PULSE +#cmakedefine WITH_IOSAUDIO +#cmakedefine WITH_OPENSLES + /* Plugins */ #cmakedefine STATIC_CHANNELS #cmakedefine WITH_RDPDR @@ -69,6 +76,7 @@ #cmakedefine WITH_DEBUG_REDIR #cmakedefine WITH_DEBUG_RFX #cmakedefine WITH_DEBUG_SCARD +#cmakedefine WITH_DEBUG_SND #cmakedefine WITH_DEBUG_SVC #cmakedefine WITH_DEBUG_RDPEI #cmakedefine WITH_DEBUG_TIMEZONE