cmake: replaced STATIC_CHANNELS with BUILTIN_CHANNELS

2016-06-15 13:36:27 +02:00 · 2016-06-15 13:36:27 +02:00 · 90cdfa7646
commit 90cdfa7646
parent 0ed98c4ee4
52 changed files with 64 additions and 55 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -87,6 +87,12 @@ else()
 endif()
 set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/")

+# Compatibility options
+if(DEFINED STATIC_CHANNELS)
+	message(WARNING "STATIC_CHANNELS is obsolete, please use BUILTIN_CHANNELS instead")
+	set(BUILTIN_CHANNELS ${STATIC_CHANNELS} CACHE BOOL "" FORCE)
+endif()
+
 # Make paths absolute
 if (CMAKE_INSTALL_PREFIX)
 	get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
@ -151,7 +157,10 @@ if(MSVC)
 	if(NOT DEFINED MSVC_RUNTIME)
 		set(MSVC_RUNTIME "dynamic")
 	endif()
-	if(${MSVC_RUNTIME} STREQUAL "static")
+	if(MSVC_RUNTIME STREQUAL "static")
+		if(BUILD_SHARED_LIBS)
+			message(FATAL_ERROR "Static CRT is only supported in a fully static build")
+		endif()
 		message(STATUS "Use the MSVC static runtime option carefully!")
 		message(STATUS "OpenSSL uses /MD by default, and is very picky")
 		message(STATUS "Random freeing errors are a common sign of runtime issues")
@ -868,7 +877,7 @@ include(${CMAKE_CPACK_INCLUDE_FILE})
 set(FREERDP_BUILD_CONFIG_LIST "")
 GET_CMAKE_PROPERTY(res VARIABLES)
 FOREACH(var ${res})
- IF (var MATCHES "^WITH_*|^BUILD_TESTING|^STATIC_CHANNELS|^HAVE_*")
+ IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*")
 	LIST(APPEND FREERDP_BUILD_CONFIG_LIST "${var}=${${var}}")
 ENDIF()
 ENDFOREACH()
--- a/channels/CMakeLists.txt
+++ b/channels/CMakeLists.txt
@ -167,7 +167,7 @@ macro(client_channel_install _targets _destination)
 endmacro(client_channel_install)

 macro(add_channel_client_library _module_prefix _module_name _channel_name _dynamic _entry)
-	if(${_dynamic} AND (NOT STATIC_CHANNELS))
+	if(${_dynamic} AND (NOT BUILTIN_CHANNELS))
 # On windows create dll version information.
 # Vendor, product and year are already set in top level CMakeLists.txt
    if (WIN32)
@ -200,7 +200,7 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna
 endmacro(add_channel_client_library)

 macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry)
-	if(${_dynamic} AND (NOT STATIC_CHANNELS))
+	if(${_dynamic} AND (NOT BUILTIN_CHANNELS))
 # On windows create dll version information.
 # Vendor, product and year are already set in top level CMakeLists.txt
    if (WIN32)
@ -232,7 +232,7 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_
 endmacro(add_channel_client_subsystem_library)

 macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry)
-	if(${_dynamic} AND (NOT STATIC_CHANNELS))
+	if(${_dynamic} AND (NOT BUILTIN_CHANNELS))
 # On windows create dll version information.
 # Vendor, product and year are already set in top level CMakeLists.txt
    if (WIN32)
--- a/channels/audin/client/CMakeLists.txt
+++ b/channels/audin/client/CMakeLists.txt
@ -27,7 +27,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE

 target_link_libraries(${MODULE_NAME} freerdp winpr)

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/audin/client/alsa/audin_alsa.c
+++ b/channels/audin/client/alsa/audin_alsa.c
@ -520,7 +520,7 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, ADDIN_ARGV* arg
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_audin_client_subsystem_entry	alsa_freerdp_audin_client_subsystem_entry
 #else
 #define freerdp_audin_client_subsystem_entry	FREERDP_API freerdp_audin_client_subsystem_entry
--- a/channels/audin/client/audin_main.c
+++ b/channels/audin/client/audin_main.c
@ -780,7 +780,7 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, ADDIN_ARGV* args)
 	return TRUE;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry		audin_DVCPluginEntry
 #else
 #define DVCPluginEntry		FREERDP_API DVCPluginEntry
--- a/channels/audin/client/mac/audin_mac.c
+++ b/channels/audin/client/mac/audin_mac.c
@ -403,7 +403,7 @@ static UINT audin_mac_parse_addin_args(AudinMacDevice *device, ADDIN_ARGV *args)
    return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_audin_client_subsystem_entry	mac_freerdp_audin_client_subsystem_entry
 #else
 #define freerdp_audin_client_subsystem_entry	FREERDP_API freerdp_audin_client_subsystem_entry
--- a/channels/audin/client/opensles/audin_opensl_es.c
+++ b/channels/audin/client/opensles/audin_opensl_es.c
@ -473,7 +473,7 @@ static UINT audin_opensles_parse_addin_args(AudinOpenSLESDevice* device,
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_audin_client_subsystem_entry \
 	opensles_freerdp_audin_client_subsystem_entry
 #else
--- a/channels/audin/client/oss/audin_oss.c
+++ b/channels/audin/client/oss/audin_oss.c
@ -483,7 +483,7 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice *device, ADDIN_ARGV *args)
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_audin_client_subsystem_entry	oss_freerdp_audin_client_subsystem_entry
 #else
 #define freerdp_audin_client_subsystem_entry	FREERDP_API freerdp_audin_client_subsystem_entry
--- a/channels/audin/client/pulse/audin_pulse.c
+++ b/channels/audin/client/pulse/audin_pulse.c
@ -523,7 +523,7 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* device, ADDIN_ARGV* a
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_audin_client_subsystem_entry	pulse_freerdp_audin_client_subsystem_entry
 #else
 #define freerdp_audin_client_subsystem_entry	FREERDP_API freerdp_audin_client_subsystem_entry
--- a/channels/audin/client/winmm/CMakeLists.txt
+++ b/channels/audin/client/winmm/CMakeLists.txt
@ -31,7 +31,7 @@ set(${MODULE_PREFIX}_LIBS freerdp winpr winmm.lib)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/audin/client/winmm/audin_winmm.c
+++ b/channels/audin/client/winmm/audin_winmm.c
@ -391,7 +391,7 @@ static UINT audin_winmm_parse_addin_args(AudinWinmmDevice* device, ADDIN_ARGV* a
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_audin_client_subsystem_entry	winmm_freerdp_audin_client_subsystem_entry
 #else
 #define freerdp_audin_client_subsystem_entry	FREERDP_API freerdp_audin_client_subsystem_entry
--- a/channels/disp/client/CMakeLists.txt
+++ b/channels/disp/client/CMakeLists.txt
@ -32,7 +32,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/disp/client/disp_main.c
+++ b/channels/disp/client/disp_main.c
@ -338,7 +338,7 @@ UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonitors, DI
 	return disp_send_display_control_monitor_layout_pdu(callback, NumMonitors, Monitors);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry		disp_DVCPluginEntry
 #else
 #define DVCPluginEntry		FREERDP_API DVCPluginEntry
--- a/channels/drive/client/CMakeLists.txt
+++ b/channels/drive/client/CMakeLists.txt
@ -36,7 +36,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE
 target_link_libraries(${MODULE_NAME} winpr freerdp)


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/drive/client/drive_main.c
+++ b/channels/drive/client/drive_main.c
@ -859,7 +859,7 @@ out_error:
 	return error;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DeviceServiceEntry	drive_DeviceServiceEntry
 #else
 #define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
--- a/channels/echo/client/CMakeLists.txt
+++ b/channels/echo/client/CMakeLists.txt
@ -25,7 +25,7 @@ include_directories(..)

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/echo/client/echo_main.c
+++ b/channels/echo/client/echo_main.c
@ -160,7 +160,7 @@ static UINT echo_plugin_terminated(IWTSPlugin* pPlugin)
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry		echo_DVCPluginEntry
 #else
 #define DVCPluginEntry		FREERDP_API DVCPluginEntry
--- a/channels/parallel/client/CMakeLists.txt
+++ b/channels/parallel/client/CMakeLists.txt
@ -27,7 +27,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE
 target_link_libraries(${MODULE_NAME} freerdp winpr)


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/parallel/client/parallel_main.c
+++ b/channels/parallel/client/parallel_main.c
@ -392,7 +392,7 @@ static UINT parallel_free(DEVICE* device)
    return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DeviceServiceEntry	parallel_DeviceServiceEntry
 #else
 #define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
--- a/channels/printer/client/CMakeLists.txt
+++ b/channels/printer/client/CMakeLists.txt
@ -49,7 +49,7 @@ endif()
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/printer/client/printer_main.c
+++ b/channels/printer/client/printer_main.c
@ -450,7 +450,7 @@ error_out:
 	return error;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DeviceServiceEntry	printer_DeviceServiceEntry
 #else
 #define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
--- a/channels/rdpei/client/CMakeLists.txt
+++ b/channels/rdpei/client/CMakeLists.txt
@ -31,7 +31,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE
 target_link_libraries(${MODULE_NAME} winpr freerdp)


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/rdpei/client/rdpei_main.c
+++ b/channels/rdpei/client/rdpei_main.c
@ -955,7 +955,7 @@ UINT rdpei_touch_end(RdpeiClientContext* context, int externalId, int x, int y,
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry		rdpei_DVCPluginEntry
 #else
 #define DVCPluginEntry		FREERDP_API DVCPluginEntry
--- a/channels/rdpgfx/client/CMakeLists.txt
+++ b/channels/rdpgfx/client/CMakeLists.txt
@ -33,7 +33,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE

 target_link_libraries(${MODULE_NAME} winpr freerdp)

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@ -1526,7 +1526,7 @@ void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cacheSlot)
 	return pData;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry		rdpgfx_DVCPluginEntry
 #else
 #define DVCPluginEntry		FREERDP_API DVCPluginEntry
--- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
+++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
@ -647,7 +647,7 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV*
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry	alsa_freerdp_rdpsnd_client_subsystem_entry
 #else
 #define freerdp_rdpsnd_client_subsystem_entry	FREERDP_API freerdp_rdpsnd_client_subsystem_entry
--- a/channels/rdpsnd/client/ios/rdpsnd_ios.c
+++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c
@ -279,7 +279,7 @@ static void rdpsnd_ios_free(rdpsndDevicePlugin* device)
 	free(p);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry	ios_freerdp_rdpsnd_client_subsystem_entry
 #else
 #define freerdp_rdpsnd_client_subsystem_entry	FREERDP_API freerdp_rdpsnd_client_subsystem_entry
--- a/channels/rdpsnd/client/mac/rdpsnd_mac.c
+++ b/channels/rdpsnd/client/mac/rdpsnd_mac.c
@ -346,7 +346,7 @@ static void rdpsnd_mac_waveplay(rdpsndDevicePlugin* device, RDPSND_WAVE* wave)
 	device->Start(device);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry	mac_freerdp_rdpsnd_client_subsystem_entry
 #else
 #define freerdp_rdpsnd_client_subsystem_entry	FREERDP_API freerdp_rdpsnd_client_subsystem_entry
--- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
+++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
@ -404,7 +404,7 @@ static int rdpsnd_opensles_parse_addin_args(rdpsndDevicePlugin* device,
 	return status;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry \
 	opensles_freerdp_rdpsnd_client_subsystem_entry
 #else
--- a/channels/rdpsnd/client/oss/rdpsnd_oss.c
+++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c
@ -475,7 +475,7 @@ static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV* a
 	return status;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry	oss_freerdp_rdpsnd_client_subsystem_entry
 #else
 #define freerdp_rdpsnd_client_subsystem_entry	FREERDP_API freerdp_rdpsnd_client_subsystem_entry
--- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
+++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
@ -634,7 +634,7 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry	pulse_freerdp_rdpsnd_client_subsystem_entry
 #else
 #define freerdp_rdpsnd_client_subsystem_entry	FREERDP_API freerdp_rdpsnd_client_subsystem_entry
--- a/channels/rdpsnd/client/winmm/CMakeLists.txt
+++ b/channels/rdpsnd/client/winmm/CMakeLists.txt
@ -32,7 +32,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
+++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
@ -344,7 +344,7 @@ static void rdpsnd_winmm_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV

 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_rdpsnd_client_subsystem_entry	winmm_freerdp_rdpsnd_client_subsystem_entry
 #else
 #define freerdp_rdpsnd_client_subsystem_entry	FREERDP_API freerdp_rdpsnd_client_subsystem_entry
--- a/channels/serial/client/CMakeLists.txt
+++ b/channels/serial/client/CMakeLists.txt
@ -27,7 +27,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE
 target_link_libraries(${MODULE_NAME} winpr freerdp)


-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/serial/client/serial_main.c
+++ b/channels/serial/client/serial_main.c
@ -811,7 +811,7 @@ static UINT serial_free(DEVICE* device)

 #endif /* __linux__ */

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DeviceServiceEntry	serial_DeviceServiceEntry
 #else
 #define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@ -42,7 +42,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE

 target_link_libraries(${MODULE_NAME} freerdp winpr)

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/tsmf/client/alsa/tsmf_alsa.c
+++ b/channels/tsmf/client/alsa/tsmf_alsa.c
@ -231,7 +231,7 @@ static void tsmf_alsa_free(ITSMFAudioDevice *audio)
 	free(alsa);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_tsmf_client_audio_subsystem_entry	alsa_freerdp_tsmf_client_audio_subsystem_entry
 #else
 #define freerdp_tsmf_client_audio_subsystem_entry	FREERDP_API freerdp_tsmf_client_audio_subsystem_entry
--- a/channels/tsmf/client/ffmpeg/CMakeLists.txt
+++ b/channels/tsmf/client/ffmpeg/CMakeLists.txt
@ -39,7 +39,7 @@ else()
    target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 endif()

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@ -541,7 +541,7 @@ static void tsmf_ffmpeg_free(ITSMFDecoder* decoder)

 static BOOL initialized = FALSE;

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_tsmf_client_subsystem_entry	ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry
 #else
 #define freerdp_tsmf_client_subsystem_entry	FREERDP_API freerdp_tsmf_client_decoder_subsystem_entry
--- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
+++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
@ -1010,7 +1010,7 @@ BOOL tsmf_gstreamer_sync(ITSMFDecoder* decoder, void (*cb)(void *), void *stream
 	return TRUE;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_tsmf_client_subsystem_entry	gstreamer_freerdp_tsmf_client_decoder_subsystem_entry
 #else
 #define freerdp_tsmf_client_subsystem_entry	FREERDP_API freerdp_tsmf_client_decoder_subsystem_entry
--- a/channels/tsmf/client/oss/tsmf_oss.c
+++ b/channels/tsmf/client/oss/tsmf_oss.c
@ -236,7 +236,7 @@ static void tsmf_oss_free(ITSMFAudioDevice* audio)
 	free(oss);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_tsmf_client_audio_subsystem_entry	oss_freerdp_tsmf_client_audio_subsystem_entry
 #else
 #define freerdp_tsmf_client_audio_subsystem_entry	FREERDP_API freerdp_tsmf_client_audio_subsystem_entry
--- a/channels/tsmf/client/pulse/tsmf_pulse.c
+++ b/channels/tsmf/client/pulse/tsmf_pulse.c
@ -358,7 +358,7 @@ static void tsmf_pulse_free(ITSMFAudioDevice *audio)
 	free(pulse);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 ITSMFAudioDevice *pulse_freerdp_tsmf_client_audio_subsystem_entry(void)
 #else
 FREERDP_API ITSMFAudioDevice *freerdp_tsmf_client_audio_subsystem_entry(void)
--- a/channels/tsmf/client/tsmf_main.c
+++ b/channels/tsmf/client/tsmf_main.c
@ -525,7 +525,7 @@ static UINT tsmf_process_addin_args(IWTSPlugin *pPlugin, ADDIN_ARGV *args)
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry	tsmf_DVCPluginEntry
 #else
 #define DVCPluginEntry	FREERDP_API DVCPluginEntry
--- a/channels/urbdrc/client/CMakeLists.txt
+++ b/channels/urbdrc/client/CMakeLists.txt
@ -46,7 +46,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)

 target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWOARD} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/urbdrc/client/libusb/CMakeLists.txt
+++ b/channels/urbdrc/client/libusb/CMakeLists.txt
@ -42,7 +42,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/urbdrc/client/libusb/libusb_udevman.c
+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
@ -577,7 +577,7 @@ static void urbdrc_udevman_parse_addin_args(UDEVMAN* udevman, ADDIN_ARGV* args)
 	while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define freerdp_urbdrc_client_subsystem_entry	libusb_freerdp_urbdrc_client_subsystem_entry
 #else
 #define freerdp_urbdrc_client_subsystem_entry	FREERDP_API freerdp_urbdrc_client_subsystem_entry
--- a/channels/urbdrc/client/urbdrc_main.c
+++ b/channels/urbdrc/client/urbdrc_main.c
@ -1539,7 +1539,7 @@ static UINT urbdrc_process_addin_args(URBDRC_PLUGIN* urbdrc, ADDIN_ARGV* args)
 	return CHANNEL_RC_OK;
 }

-#ifdef STATIC_CHANNELS
+#ifdef BUILTIN_CHANNELS
 #define DVCPluginEntry urbdrc_DVCPluginEntry
 #else
 #define DVCPluginEntry FREERDP_API DVCPluginEntry
--- a/ci/cmake-preloads/config-linux-all.txt
+++ b/ci/cmake-preloads/config-linux-all.txt
@ -5,7 +5,7 @@ set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type")
 set (BUILD_TESTING ON CACHE BOOL "build testing")
 set (WITH_PULSE ON CACHE BOOL "pulse")
 set (WITH_CHANNELS ON CACHE BOOL "channels")
-set (STATIC_CHANNELS ON CACHE BOOL "static channels")
+set (BUILTIN_CHANNELS ON CACHE BOOL "static channels")
 set (WITH_CUPS ON CACHE BOOL "cups")
 set (WITH_PCSC ON CACHE BOOL "PCSC")
 set (WITH_JPEG ON CACHE BOOL "jepg")
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@ -68,7 +68,7 @@ cmake_dependent_option(WITH_CLIENT "Build client binaries" ON "WITH_CLIENT_COMMO

 option(WITH_SERVER "Build server binaries" OFF)

-option(STATIC_CHANNELS "Build channels statically" ON)
+option(BUILTIN_CHANNELS "Combine all channels into their respective base library" ON)

 option(WITH_CHANNELS "Build virtual channel plugins" ON)

--- a/config.h.in
+++ b/config.h.in
@ -51,7 +51,7 @@
 #cmakedefine WITH_MEDIA_FOUNDATION

 /* Plugins */
-#cmakedefine STATIC_CHANNELS
+#cmakedefine BUILTIN_CHANNELS
 #cmakedefine WITH_RDPDR


--- a/packaging/deb/freerdp-nightly/rules
+++ b/packaging/deb/freerdp-nightly/rules
@ -6,7 +6,7 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
                          -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
                          -DWITH_PULSE=ON \
                          -DWITH_CHANNELS=ON \
-                          -DSTATIC_CHANNELS=ON \
+                          -DBUILTIN_CHANNELS=ON \
                          -DWITH_CUPS=ON \
                          -DWITH_PCSC=ON \
                          -DWITH_JPEG=ON \
--- a/packaging/rpm/freerdp-nightly.spec
+++ b/packaging/rpm/freerdp-nightly.spec
@ -95,7 +95,7 @@ based on freerdp and winpr.
        -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
        -DWITH_PULSE=ON \
        -DWITH_CHANNELS=ON \
-        -DSTATIC_CHANNELS=ON \
+        -DBUILTIN_CHANNELS=ON \
        -DWITH_CUPS=ON \
        -DWITH_PCSC=ON \
        -DWITH_JPEG=ON \