From 90cdfa76465ce10422539021d7428df1bec08f5a Mon Sep 17 00:00:00 2001 From: Norbert Federa Date: Wed, 15 Jun 2016 13:36:27 +0200 Subject: [PATCH] cmake: replaced STATIC_CHANNELS with BUILTIN_CHANNELS --- CMakeLists.txt | 13 +++++++++++-- channels/CMakeLists.txt | 6 +++--- channels/audin/client/CMakeLists.txt | 2 +- channels/audin/client/alsa/audin_alsa.c | 2 +- channels/audin/client/audin_main.c | 2 +- channels/audin/client/mac/audin_mac.c | 2 +- channels/audin/client/opensles/audin_opensl_es.c | 2 +- channels/audin/client/oss/audin_oss.c | 2 +- channels/audin/client/pulse/audin_pulse.c | 2 +- channels/audin/client/winmm/CMakeLists.txt | 2 +- channels/audin/client/winmm/audin_winmm.c | 2 +- channels/disp/client/CMakeLists.txt | 2 +- channels/disp/client/disp_main.c | 2 +- channels/drive/client/CMakeLists.txt | 2 +- channels/drive/client/drive_main.c | 2 +- channels/echo/client/CMakeLists.txt | 2 +- channels/echo/client/echo_main.c | 2 +- channels/parallel/client/CMakeLists.txt | 2 +- channels/parallel/client/parallel_main.c | 2 +- channels/printer/client/CMakeLists.txt | 2 +- channels/printer/client/printer_main.c | 2 +- channels/rdpei/client/CMakeLists.txt | 2 +- channels/rdpei/client/rdpei_main.c | 2 +- channels/rdpgfx/client/CMakeLists.txt | 2 +- channels/rdpgfx/client/rdpgfx_main.c | 2 +- channels/rdpsnd/client/alsa/rdpsnd_alsa.c | 2 +- channels/rdpsnd/client/ios/rdpsnd_ios.c | 2 +- channels/rdpsnd/client/mac/rdpsnd_mac.c | 2 +- channels/rdpsnd/client/opensles/rdpsnd_opensles.c | 2 +- channels/rdpsnd/client/oss/rdpsnd_oss.c | 2 +- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 2 +- channels/rdpsnd/client/winmm/CMakeLists.txt | 2 +- channels/rdpsnd/client/winmm/rdpsnd_winmm.c | 2 +- channels/serial/client/CMakeLists.txt | 2 +- channels/serial/client/serial_main.c | 2 +- channels/tsmf/client/CMakeLists.txt | 2 +- channels/tsmf/client/alsa/tsmf_alsa.c | 2 +- channels/tsmf/client/ffmpeg/CMakeLists.txt | 2 +- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 2 +- channels/tsmf/client/gstreamer/tsmf_gstreamer.c | 2 +- channels/tsmf/client/oss/tsmf_oss.c | 2 +- channels/tsmf/client/pulse/tsmf_pulse.c | 2 +- channels/tsmf/client/tsmf_main.c | 2 +- channels/urbdrc/client/CMakeLists.txt | 2 +- channels/urbdrc/client/libusb/CMakeLists.txt | 2 +- channels/urbdrc/client/libusb/libusb_udevman.c | 2 +- channels/urbdrc/client/urbdrc_main.c | 2 +- ci/cmake-preloads/config-linux-all.txt | 2 +- cmake/ConfigOptions.cmake | 2 +- config.h.in | 2 +- packaging/deb/freerdp-nightly/rules | 2 +- packaging/rpm/freerdp-nightly.spec | 2 +- 52 files changed, 64 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 389af1a5c..f8069144b 100644 --- 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() diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index b0bd1978a..76a571692 100644 --- 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) diff --git a/channels/audin/client/CMakeLists.txt b/channels/audin/client/CMakeLists.txt index 9e2f47bc5..0c2e393ee 100644 --- 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() diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index e49a1cc97..92bfd2374 100644 --- 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 diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 901b29c05..3b5fbf709 100644 --- 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 diff --git a/channels/audin/client/mac/audin_mac.c b/channels/audin/client/mac/audin_mac.c index 4604bcd36..0be2c6131 100644 --- 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 diff --git a/channels/audin/client/opensles/audin_opensl_es.c b/channels/audin/client/opensles/audin_opensl_es.c index cd0d3999d..05e498167 100644 --- 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 diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index 753298bb2..b368ae266 100644 --- 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 diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index ad2f480fc..7f3510ca8 100644 --- 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 diff --git a/channels/audin/client/winmm/CMakeLists.txt b/channels/audin/client/winmm/CMakeLists.txt index 074b5ced9..2eddb8e16 100644 --- 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() diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c index e59a84ed6..d31d05560 100644 --- 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 diff --git a/channels/disp/client/CMakeLists.txt b/channels/disp/client/CMakeLists.txt index d0bbaeb56..1ec2c6f9d 100644 --- 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() diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index fb23d8b5e..0f67b7bba 100644 --- 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 diff --git a/channels/drive/client/CMakeLists.txt b/channels/drive/client/CMakeLists.txt index 3d5afae04..ba2d0f4f9 100644 --- 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() diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 6e858db1a..f71b47197 100644 --- 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 diff --git a/channels/echo/client/CMakeLists.txt b/channels/echo/client/CMakeLists.txt index 29e45deba..149fbbf5a 100644 --- 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() diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c index ba50aaaad..a16089fd9 100644 --- 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 diff --git a/channels/parallel/client/CMakeLists.txt b/channels/parallel/client/CMakeLists.txt index 21f4a03d6..255435bdb 100644 --- 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() diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 58bc9c2b1..e8513b3ad 100644 --- 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 diff --git a/channels/printer/client/CMakeLists.txt b/channels/printer/client/CMakeLists.txt index 94c3cb0e5..ea2f0df22 100644 --- 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() diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index e188a8412..8a8d14285 100644 --- 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 diff --git a/channels/rdpei/client/CMakeLists.txt b/channels/rdpei/client/CMakeLists.txt index 723cbc0fc..79cc5a11c 100644 --- 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() diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 6acfcc739..306700c0b 100644 --- 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 diff --git a/channels/rdpgfx/client/CMakeLists.txt b/channels/rdpgfx/client/CMakeLists.txt index 1dbf82f80..19c5d21b0 100644 --- 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() diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index 2a8cb7628..50403eade 100644 --- 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 diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index ea4230d28..01b9c9b6b 100644 --- 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 diff --git a/channels/rdpsnd/client/ios/rdpsnd_ios.c b/channels/rdpsnd/client/ios/rdpsnd_ios.c index 148c846a8..6108defd2 100644 --- 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 diff --git a/channels/rdpsnd/client/mac/rdpsnd_mac.c b/channels/rdpsnd/client/mac/rdpsnd_mac.c index 72cfbe83c..3c7f13c8d 100644 --- 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 diff --git a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c index 8c8b34e0d..39b26f6c3 100644 --- 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 diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index 2a6d3651b..520996929 100644 --- 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 diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 5181d0d07..cac2240ac 100644 --- 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 diff --git a/channels/rdpsnd/client/winmm/CMakeLists.txt b/channels/rdpsnd/client/winmm/CMakeLists.txt index 43c7257a3..b4a337dcd 100644 --- 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() diff --git a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c index 7eb1a5f88..57336ba64 100644 --- 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 diff --git a/channels/serial/client/CMakeLists.txt b/channels/serial/client/CMakeLists.txt index 086e1419e..f16995b00 100644 --- 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() diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index b9650a9e5..b52d9750b 100644 --- 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 diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt index 6916bc59d..ee172fc27 100644 --- 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() diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index 078c7d8f1..a5bc72750 100644 --- 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 diff --git a/channels/tsmf/client/ffmpeg/CMakeLists.txt b/channels/tsmf/client/ffmpeg/CMakeLists.txt index e18e0b3e2..cda0bdfd7 100644 --- 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() diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index 4e5beff8f..7156e8faf 100644 --- 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 diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index 466dd7d24..1211e8dcb 100644 --- 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 diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index da792bea9..784ea0ca8 100644 --- 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 diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index e9ea79b7d..5a5a0ef6d 100644 --- 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) diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index bc202ead9..3a04afb02 100644 --- 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 diff --git a/channels/urbdrc/client/CMakeLists.txt b/channels/urbdrc/client/CMakeLists.txt index a1d5f5fe1..24c7ee94b 100644 --- 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() diff --git a/channels/urbdrc/client/libusb/CMakeLists.txt b/channels/urbdrc/client/libusb/CMakeLists.txt index bb4200278..abb435637 100644 --- 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() diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index b8af3a4c7..cfa5ff1d0 100644 --- 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 diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index cbb937996..42699bd9b 100644 --- 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 diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index 010e86534..30a00bf9f 100644 --- 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") diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake index 31bfcd5a3..d2868f273 100644 --- 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) diff --git a/config.h.in b/config.h.in index b52fdb3c1..466855295 100644 --- 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 diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index 1894c9ced..5cf2d9e40 100755 --- 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 \ diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index bb6da1ab2..92580b4e5 100644 --- 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 \