From fd027d1bf094f71f618a8d2f158033ba4b479a2a Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 16 Feb 2022 15:45:55 +0100 Subject: [PATCH] Removed BUILTIN_CHANNELS Building client channels out of tree does not work reliable as the dependencies can not be easily split. (exceptions may be simple ones as echo channel) It does complicate the build system and code though, so remove this for maintainability reasons. --- CMakeLists.txt | 8 +- channels/CMakeLists.txt | 117 ++++-------------- channels/ainput/client/CMakeLists.txt | 2 +- channels/ainput/client/ainput_main.c | 8 +- channels/audin/client/CMakeLists.txt | 4 - channels/audin/client/alsa/audin_alsa.c | 8 +- channels/audin/client/audin_main.c | 8 +- channels/audin/client/ios/audin_ios.m | 8 +- channels/audin/client/mac/audin_mac.m | 8 +- .../audin/client/opensles/audin_opensl_es.c | 8 +- channels/audin/client/oss/audin_oss.c | 8 +- channels/audin/client/pulse/audin_pulse.c | 8 +- channels/audin/client/sndio/audin_sndio.c | 8 +- channels/audin/client/winmm/CMakeLists.txt | 5 - channels/audin/client/winmm/audin_winmm.c | 8 +- channels/disp/client/CMakeLists.txt | 5 - channels/disp/client/disp_main.c | 8 +- channels/drive/client/CMakeLists.txt | 7 -- channels/drive/client/drive_main.c | 8 +- channels/echo/client/CMakeLists.txt | 4 - channels/echo/client/echo_main.c | 8 +- channels/geometry/client/CMakeLists.txt | 7 +- channels/geometry/client/geometry_main.c | 8 +- channels/parallel/client/CMakeLists.txt | 7 -- channels/parallel/client/parallel_main.c | 8 +- channels/printer/client/CMakeLists.txt | 4 - channels/printer/client/cups/printer_cups.c | 4 - channels/printer/client/printer_main.c | 5 - channels/printer/client/win/printer_win.c | 4 - channels/rdp2tcp/client/CMakeLists.txt | 6 +- channels/rdpei/client/CMakeLists.txt | 7 -- channels/rdpei/client/rdpei_main.c | 8 +- channels/rdpgfx/client/CMakeLists.txt | 6 - channels/rdpgfx/client/rdpgfx_main.c | 8 +- channels/rdpsnd/client/alsa/rdpsnd_alsa.c | 8 +- channels/rdpsnd/client/fake/rdpsnd_fake.c | 8 +- channels/rdpsnd/client/ios/rdpsnd_ios.c | 8 +- channels/rdpsnd/client/mac/rdpsnd_mac.m | 8 +- .../rdpsnd/client/opensles/rdpsnd_opensles.c | 9 +- channels/rdpsnd/client/oss/rdpsnd_oss.c | 8 +- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 8 +- channels/rdpsnd/client/sndio/rdpsnd_sndio.c | 8 +- channels/rdpsnd/client/winmm/CMakeLists.txt | 6 - channels/rdpsnd/client/winmm/rdpsnd_winmm.c | 8 +- channels/serial/client/CMakeLists.txt | 7 -- channels/serial/client/serial_main.c | 8 +- channels/sshagent/client/CMakeLists.txt | 4 - channels/sshagent/client/sshagent_main.c | 8 +- channels/tsmf/client/CMakeLists.txt | 4 - channels/tsmf/client/alsa/tsmf_alsa.c | 9 +- channels/tsmf/client/ffmpeg/CMakeLists.txt | 6 - channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 8 +- .../tsmf/client/gstreamer/tsmf_gstreamer.c | 8 +- channels/tsmf/client/oss/tsmf_oss.c | 9 +- channels/tsmf/client/pulse/tsmf_pulse.c | 4 - channels/tsmf/client/tsmf_main.c | 8 +- channels/urbdrc/client/CMakeLists.txt | 6 +- channels/urbdrc/client/libusb/CMakeLists.txt | 4 - .../urbdrc/client/libusb/libusb_udevman.c | 7 +- channels/urbdrc/client/urbdrc_main.c | 7 +- channels/video/client/CMakeLists.txt | 10 -- channels/video/client/video_main.c | 9 +- ci/cmake-preloads/config-linux-all.txt | 1 - cmake/ConfigOptions.cmake | 2 - config.h.in | 1 - packaging/deb/freerdp-nightly/rules | 1 - packaging/rpm/freerdp-nightly.spec | 1 - rdtk/templates/CMakeLists.txt | 2 +- server/proxy/CMakeLists.txt | 8 -- server/shadow/CMakeLists.txt | 4 - uwac/templates/CMakeLists.txt | 2 +- 71 files changed, 69 insertions(+), 496 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9751fa7d7..96f38033e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,12 +120,6 @@ if (WITH_FREERDP_DEPRECATED) add_definitions(-DWITH_FREERDP_DEPRECATED) endif() -# 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) @@ -1004,7 +998,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|^BUILTIN_CHANNELS|^HAVE_*") + IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*") LIST(APPEND FREERDP_BUILD_CONFIG_LIST "${var}=${${var}}") ENDIF() ENDFOREACH() diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index 7eaccc0bb..e0d8d478e 100644 --- a/channels/CMakeLists.txt +++ b/channels/CMakeLists.txt @@ -163,7 +163,7 @@ macro(add_channel_client_subsystem _channel_prefix _channel_name _subsystem _typ endmacro(add_channel_client_subsystem) macro(channel_install _targets _destination _export_target) - if (NOT BUILTIN_CHANNELS OR NOT BUILD_SHARED_LIBS) + if (NOT BUILD_SHARED_LIBS) install(TARGETS ${_targets} DESTINATION ${_destination} EXPORT ${_export_target}) endif() endmacro(channel_install) @@ -182,39 +182,16 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna link_directories(${_lnk_dir}) endif() - 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) - set (RC_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}) - set (RC_VERSION_MINOR ${FREERDP_VERSION_MINOR}) - set (RC_VERSION_BUILD ${FREERDP_VERSION_REVISION}) - set (RC_VERSION_PATCH 0) - set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) + set(${_module_prefix}_STATIC ON PARENT_SCOPE) + set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) + set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) + set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) + add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) + target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) - configure_file( - ${PROJECT_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/version.rc - @ONLY) - - set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc) - endif() - - add_library(${_module_name} ${${_module_prefix}_SRCS}) - target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) - client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - else() - set(${_module_prefix}_STATIC ON PARENT_SCOPE) - set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) - set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) - set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) - add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) - target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) - - if (NOT BUILD_SHARED_LIBS) - client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() - endif() + if (NOT BUILD_SHARED_LIBS) + client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) + endif() endmacro(add_channel_client_library) macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry) @@ -223,38 +200,15 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_ link_directories(${_lnk_dir}) endif() - 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) - set (RC_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}) - set (RC_VERSION_MINOR ${FREERDP_VERSION_MINOR}) - set (RC_VERSION_BUILD ${FREERDP_VERSION_REVISION}) - set (RC_VERSION_PATCH 0) - set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) + set(${_module_prefix}_STATIC ON PARENT_SCOPE) + set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) + set(${_module_prefix}_TYPE ${_type} PARENT_SCOPE) - configure_file( - ${PROJECT_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/version.rc - @ONLY) - - set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc) - endif() - - add_library(${_module_name} ${${_module_prefix}_SRCS}) - target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) - client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - else() - set(${_module_prefix}_STATIC ON PARENT_SCOPE) - set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) - set(${_module_prefix}_TYPE ${_type} PARENT_SCOPE) - - add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) - target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) - if (NOT BUILD_SHARED_LIBS) - client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() - endif() + add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) + target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) + if (NOT BUILD_SHARED_LIBS) + client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) + endif() endmacro(add_channel_client_subsystem_library) macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry) @@ -263,34 +217,13 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna link_directories(${_lnk_dir}) endif() - 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) - set (RC_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}) - set (RC_VERSION_MINOR ${FREERDP_VERSION_MINOR}) - set (RC_VERSION_BUILD ${FREERDP_VERSION_REVISION}) - set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}${FREERDP_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) - - configure_file( - ${PROJECT_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/version.rc - @ONLY) - - set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc) - endif() - - add_library(${_module_name} ${${_module_prefix}_SRCS}) - server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - else() - set(${_module_prefix}_STATIC ON PARENT_SCOPE) - set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) - set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) - set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) - add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) - if (NOT BUILD_SHARED_LIBS) - server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() + set(${_module_prefix}_STATIC ON PARENT_SCOPE) + set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) + set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) + set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) + add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) + if (NOT BUILD_SHARED_LIBS) + server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) endif() endmacro(add_channel_server_library) diff --git a/channels/ainput/client/CMakeLists.txt b/channels/ainput/client/CMakeLists.txt index 4cf2d2273..816207677 100644 --- a/channels/ainput/client/CMakeLists.txt +++ b/channels/ainput/client/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) +if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) endif() diff --git a/channels/ainput/client/ainput_main.c b/channels/ainput/client/ainput_main.c index e9faaf2b4..c777e87dd 100644 --- a/channels/ainput/client/ainput_main.c +++ b/channels/ainput/client/ainput_main.c @@ -269,18 +269,12 @@ static UINT ainput_plugin_terminated(IWTSPlugin* pPlugin) return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry ainput_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT ainput_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT status = CHANNEL_RC_OK; AINPUT_PLUGIN* ainput = (AINPUT_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, "ainput"); diff --git a/channels/audin/client/CMakeLists.txt b/channels/audin/client/CMakeLists.txt index 0c4e04553..9a35bb32e 100644 --- a/channels/audin/client/CMakeLists.txt +++ b/channels/audin/client/CMakeLists.txt @@ -27,10 +27,6 @@ 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 BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") if(WITH_OSS) diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index e72645e4e..f2e268827 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -390,18 +390,12 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG return CHANNEL_RC_OK; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT alsa_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; AudinALSADevice* alsa; diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 11ae2814a..0bafaa98d 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -953,18 +953,12 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) return TRUE; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry audin_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT audin_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { struct SubsystemEntry { diff --git a/channels/audin/client/ios/audin_ios.m b/channels/audin/client/ios/audin_ios.m index 02ad5541c..b485e2619 100644 --- a/channels/audin/client/ios/audin_ios.m +++ b/channels/audin/client/ios/audin_ios.m @@ -296,13 +296,7 @@ typedef struct return CHANNEL_RC_OK; } - #ifdef BUILTIN_CHANNELS - #define freerdp_audin_client_subsystem_entry ios_freerdp_audin_client_subsystem_entry - #else - #define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry - #endif - - UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) + UINT ios_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { DWORD errCode; char errString[1024]; diff --git a/channels/audin/client/mac/audin_mac.m b/channels/audin/client/mac/audin_mac.m index 92ce73034..3fdab5a68 100644 --- a/channels/audin/client/mac/audin_mac.m +++ b/channels/audin/client/mac/audin_mac.m @@ -381,13 +381,7 @@ static UINT audin_mac_parse_addin_args(AudinMacDevice *device, const ADDIN_ARGV return CHANNEL_RC_OK; } -#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 -#endif - -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT mac_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { DWORD errCode; char errString[1024]; diff --git a/channels/audin/client/opensles/audin_opensl_es.c b/channels/audin/client/opensles/audin_opensl_es.c index 282f8ff54..72175b42b 100644 --- a/channels/audin/client/opensles/audin_opensl_es.c +++ b/channels/audin/client/opensles/audin_opensl_es.c @@ -288,18 +288,12 @@ static UINT audin_opensles_parse_addin_args(AudinOpenSLESDevice* device, const A return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define freerdp_audin_client_subsystem_entry opensles_freerdp_audin_client_subsystem_entry -#else -#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT opensles_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; AudinOpenSLESDevice* opensles; diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index 5cf2dbdc4..45bffa1d2 100644 --- a/channels/audin/client/oss/audin_oss.c +++ b/channels/audin/client/oss/audin_oss.c @@ -443,18 +443,12 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* return CHANNEL_RC_OK; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT oss_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; AudinOSSDevice* oss; diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 1949b3ac1..387445191 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -505,18 +505,12 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* device, const ADDIN_A return CHANNEL_RC_OK; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT pulse_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; AudinPulseDevice* pulse; diff --git a/channels/audin/client/sndio/audin_sndio.c b/channels/audin/client/sndio/audin_sndio.c index 995647b33..0f9aac8a2 100644 --- a/channels/audin/client/sndio/audin_sndio.c +++ b/channels/audin/client/sndio/audin_sndio.c @@ -305,18 +305,12 @@ static UINT audin_sndio_parse_addin_args(AudinSndioDevice* device, ADDIN_ARGV* a return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define freerdp_audin_client_subsystem_entry sndio_freerdp_audin_client_subsystem_entry -#else -#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT sndio_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { ADDIN_ARGV* args; AudinSndioDevice* sndio; diff --git a/channels/audin/client/winmm/CMakeLists.txt b/channels/audin/client/winmm/CMakeLists.txt index 408a3a2e1..21684de7e 100644 --- a/channels/audin/client/winmm/CMakeLists.txt +++ b/channels/audin/client/winmm/CMakeLists.txt @@ -30,9 +30,4 @@ set(${MODULE_PREFIX}_LIBS freerdp winpr winmm.lib) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client/winmm") diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c index f3d64abff..cbb442395 100644 --- a/channels/audin/client/winmm/audin_winmm.c +++ b/channels/audin/client/winmm/audin_winmm.c @@ -491,18 +491,12 @@ static UINT audin_winmm_parse_addin_args(AudinWinmmDevice* device, const ADDIN_A return CHANNEL_RC_OK; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +UINT winmm_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; AudinWinmmDevice* winmm; diff --git a/channels/disp/client/CMakeLists.txt b/channels/disp/client/CMakeLists.txt index c8c1f8560..b22b3ab1f 100644 --- a/channels/disp/client/CMakeLists.txt +++ b/channels/disp/client/CMakeLists.txt @@ -33,9 +33,4 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index 66b80f261..dff908a1d 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -390,18 +390,12 @@ static UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonit return disp_send_display_control_monitor_layout_pdu(callback, NumMonitors, Monitors); } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry disp_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT disp_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT error = CHANNEL_RC_OK; DISP_PLUGIN* disp; diff --git a/channels/drive/client/CMakeLists.txt b/channels/drive/client/CMakeLists.txt index 33de5e68b..d4821c1e7 100644 --- a/channels/drive/client/CMakeLists.txt +++ b/channels/drive/client/CMakeLists.txt @@ -24,13 +24,6 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") - - target_link_libraries(${MODULE_NAME} winpr freerdp) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 82cd344ca..2b6ed989b 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -994,18 +994,12 @@ out_error: return error; } -#ifdef BUILTIN_CHANNELS -#define DeviceServiceEntry drive_DeviceServiceEntry -#else -#define DeviceServiceEntry FREERDP_API DeviceServiceEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) +UINT drive_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) { RDPDR_DRIVE* drive; UINT error; diff --git a/channels/echo/client/CMakeLists.txt b/channels/echo/client/CMakeLists.txt index ade3d71d6..1a6b32357 100644 --- a/channels/echo/client/CMakeLists.txt +++ b/channels/echo/client/CMakeLists.txt @@ -25,9 +25,5 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - target_link_libraries(${MODULE_NAME} winpr) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c index 8d6fdd878..54a296ac7 100644 --- a/channels/echo/client/echo_main.c +++ b/channels/echo/client/echo_main.c @@ -173,18 +173,12 @@ static UINT echo_plugin_terminated(IWTSPlugin* pPlugin) return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry echo_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT echo_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT status = CHANNEL_RC_OK; ECHO_PLUGIN* echo; diff --git a/channels/geometry/client/CMakeLists.txt b/channels/geometry/client/CMakeLists.txt index 662f8eb12..45efa58fd 100644 --- a/channels/geometry/client/CMakeLists.txt +++ b/channels/geometry/client/CMakeLists.txt @@ -26,15 +26,10 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) -if (NOT BUILTIN_CHANNELS OR NOT BUILD_SHARED_LIBS) +if (NOT BUILD_SHARED_LIBS) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client) endif() target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c index c24b19138..a1e5d0e9e 100644 --- a/channels/geometry/client/geometry_main.c +++ b/channels/geometry/client/geometry_main.c @@ -443,18 +443,12 @@ static void mappedGeometryUnref_void(void* arg) * Channel Client Interface */ -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry geometry_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT geometry_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT error = CHANNEL_RC_OK; GEOMETRY_PLUGIN* geometry; diff --git a/channels/parallel/client/CMakeLists.txt b/channels/parallel/client/CMakeLists.txt index 05c1147e1..38285f974 100644 --- a/channels/parallel/client/CMakeLists.txt +++ b/channels/parallel/client/CMakeLists.txt @@ -22,13 +22,6 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") - - target_link_libraries(${MODULE_NAME} freerdp winpr) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 8ce7637f7..c0a9f440b 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -404,18 +404,12 @@ static UINT parallel_free(DEVICE* device) return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define DeviceServiceEntry parallel_DeviceServiceEntry -#else -#define DeviceServiceEntry FREERDP_API DeviceServiceEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) +UINT parallel_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) { char* name; char* path; diff --git a/channels/printer/client/CMakeLists.txt b/channels/printer/client/CMakeLists.txt index f2c17c001..91988e497 100644 --- a/channels/printer/client/CMakeLists.txt +++ b/channels/printer/client/CMakeLists.txt @@ -25,10 +25,6 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") if(WITH_CUPS) diff --git a/channels/printer/client/cups/printer_cups.c b/channels/printer/client/cups/printer_cups.c index 5c1ca83fb..6c8207c37 100644 --- a/channels/printer/client/cups/printer_cups.c +++ b/channels/printer/client/cups/printer_cups.c @@ -382,11 +382,7 @@ static void printer_cups_release_ref_driver(rdpPrinterDriver* driver) cups_driver->references--; } -#ifdef BUILTIN_CHANNELS rdpPrinterDriver* cups_freerdp_printer_client_subsystem_entry(void) -#else -FREERDP_API rdpPrinterDriver* freerdp_printer_client_subsystem_entry(void) -#endif { if (!uniq_cups_driver) { diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index 0a10ba469..3549cf7cb 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -961,12 +961,7 @@ static rdpPrinterDriver* printer_load_backend(const char* backend) * @return 0 on success, otherwise a Win32 error code */ UINT -#ifdef BUILTIN_CHANNELS printer_DeviceServiceEntry -#else - FREERDP_API - DeviceServiceEntry -#endif (PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) { int i; diff --git a/channels/printer/client/win/printer_win.c b/channels/printer/client/win/printer_win.c index 68905bc4c..5bd147843 100644 --- a/channels/printer/client/win/printer_win.c +++ b/channels/printer/client/win/printer_win.c @@ -416,11 +416,7 @@ static void printer_win_release_ref_driver(rdpPrinterDriver* driver) win->references--; } -#ifdef BUILTIN_CHANNELS rdpPrinterDriver* win_freerdp_printer_client_subsystem_entry(void) -#else -FREERDP_API rdpPrinterDriver* freerdp_printer_client_subsystem_entry(void) -#endif { if (!win_driver) { diff --git a/channels/rdp2tcp/client/CMakeLists.txt b/channels/rdp2tcp/client/CMakeLists.txt index 0bcf1dc24..2e510200e 100644 --- a/channels/rdp2tcp/client/CMakeLists.txt +++ b/channels/rdp2tcp/client/CMakeLists.txt @@ -22,10 +22,6 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "VirtualChannelEntryEx") -if(BUILTIN_CHANNELS) - target_link_libraries(${MODULE_NAME} freerdp) -else() - target_link_libraries(${MODULE_NAME} winpr freerdp) -endif() +target_link_libraries(${MODULE_NAME} freerdp) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/rdpei/client/CMakeLists.txt b/channels/rdpei/client/CMakeLists.txt index cc689589d..b4d551b5e 100644 --- a/channels/rdpei/client/CMakeLists.txt +++ b/channels/rdpei/client/CMakeLists.txt @@ -26,13 +26,6 @@ set(${MODULE_PREFIX}_SRCS include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") - - target_link_libraries(${MODULE_NAME} winpr freerdp) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 9eecad371..216360482 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -1457,18 +1457,12 @@ static UINT rdpei_pen_raw_event(RdpeiClientContext* context, INT32 externalId, U return error; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry rdpei_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT rdpei_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT error; RDPEI_PLUGIN* rdpei = NULL; diff --git a/channels/rdpgfx/client/CMakeLists.txt b/channels/rdpgfx/client/CMakeLists.txt index de2383ab0..a1005825d 100644 --- a/channels/rdpgfx/client/CMakeLists.txt +++ b/channels/rdpgfx/client/CMakeLists.txt @@ -29,13 +29,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") - - target_link_libraries(${MODULE_NAME} winpr freerdp) -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index d2dcdf287..7dbf74965 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -2047,12 +2047,6 @@ static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cac return pData; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry rdpgfx_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - RdpgfxClientContext* rdpgfx_client_context_new(rdpSettings* settings) { RDPGFX_PLUGIN* gfx; @@ -2168,7 +2162,7 @@ void rdpgfx_client_context_free(RdpgfxClientContext* context) * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT rdpgfx_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT error = CHANNEL_RC_OK; RDPGFX_PLUGIN* gfx; diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index 9c2110e8b..f0b578df5 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -516,18 +516,12 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN return CHANNEL_RC_OK; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT alsa_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; rdpsndAlsaPlugin* alsa; diff --git a/channels/rdpsnd/client/fake/rdpsnd_fake.c b/channels/rdpsnd/client/fake/rdpsnd_fake.c index 542717bd8..38f493edd 100644 --- a/channels/rdpsnd/client/fake/rdpsnd_fake.c +++ b/channels/rdpsnd/client/fake/rdpsnd_fake.c @@ -105,18 +105,12 @@ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARG return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define freerdp_rdpsnd_client_subsystem_entry fake_freerdp_rdpsnd_client_subsystem_entry -#else -#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT fake_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; rdpsndFakePlugin* fake; diff --git a/channels/rdpsnd/client/ios/rdpsnd_ios.c b/channels/rdpsnd/client/ios/rdpsnd_ios.c index 6b226c5c4..923a7e381 100644 --- a/channels/rdpsnd/client/ios/rdpsnd_ios.c +++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c @@ -259,18 +259,12 @@ static void rdpsnd_ios_free(rdpsndDevicePlugin* device) free(p); } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT ios_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { rdpsndIOSPlugin* p = (rdpsndIOSPlugin*)calloc(1, sizeof(rdpsndIOSPlugin)); diff --git a/channels/rdpsnd/client/mac/rdpsnd_mac.m b/channels/rdpsnd/client/mac/rdpsnd_mac.m index d9dcdd5cf..0898e03c2 100644 --- a/channels/rdpsnd/client/mac/rdpsnd_mac.m +++ b/channels/rdpsnd/client/mac/rdpsnd_mac.m @@ -357,18 +357,12 @@ static UINT rdpsnd_mac_play(rdpsndDevicePlugin *device, const BYTE *data, size_t return mac->diff > UINT_MAX ? UINT_MAX : mac->diff; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT mac_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { rdpsndMacPlugin *mac; mac = (rdpsndMacPlugin *)calloc(1, sizeof(rdpsndMacPlugin)); diff --git a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c index aae293e55..faadb2add 100644 --- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c +++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c @@ -328,18 +328,13 @@ static int rdpsnd_opensles_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_AR return status; } -#ifdef BUILTIN_CHANNELS -#define freerdp_rdpsnd_client_subsystem_entry opensles_freerdp_rdpsnd_client_subsystem_entry -#else -#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT opensles_freerdp_rdpsnd_client_subsystem_entry( + PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { ADDIN_ARGV* args; rdpsndopenslesPlugin* opensles; diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index c6878c2cd..5e182c771 100644 --- a/channels/rdpsnd/client/oss/rdpsnd_oss.c +++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c @@ -441,18 +441,12 @@ static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_A return status; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT oss_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)calloc(1, sizeof(rdpsndOssPlugin)); diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 2e3c7443c..0849c9858 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -568,18 +568,12 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndDevicePlugin* device, const ADDI return CHANNEL_RC_OK; } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT pulse_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { const ADDIN_ARGV* args; rdpsndPulsePlugin* pulse; diff --git a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c index 776b20c0d..8e0ec8be7 100644 --- a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c +++ b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c @@ -176,18 +176,12 @@ static UINT rdpsnd_sndio_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define freerdp_rdpsnd_client_subsystem_entry sndio_freerdp_rdpsnd_client_subsystem_entry -#else -#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT sndio_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { ADDIN_ARGV* args; rdpsndSndioPlugin* sndio; diff --git a/channels/rdpsnd/client/winmm/CMakeLists.txt b/channels/rdpsnd/client/winmm/CMakeLists.txt index b4a337dcd..ebe0fcb68 100644 --- a/channels/rdpsnd/client/winmm/CMakeLists.txt +++ b/channels/rdpsnd/client/winmm/CMakeLists.txt @@ -24,16 +24,10 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") - - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winmm.lib) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_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() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client/WinMM") diff --git a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c index 52e4a792e..e732631c8 100644 --- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c +++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c @@ -310,18 +310,12 @@ static void rdpsnd_winmm_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV WINPR_UNUSED(args); } -#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 -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) +UINT winmm_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints) { ADDIN_ARGV* args; rdpsndWinmmPlugin* winmm; diff --git a/channels/serial/client/CMakeLists.txt b/channels/serial/client/CMakeLists.txt index fb08df0f0..89065b534 100644 --- a/channels/serial/client/CMakeLists.txt +++ b/channels/serial/client/CMakeLists.txt @@ -22,13 +22,6 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") - - target_link_libraries(${MODULE_NAME} winpr freerdp) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index e15b96606..6316eee62 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -797,18 +797,12 @@ static UINT serial_free(DEVICE* device) #endif /* __linux__ */ -#ifdef BUILTIN_CHANNELS -#define DeviceServiceEntry serial_DeviceServiceEntry -#else -#define DeviceServiceEntry FREERDP_API DeviceServiceEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) +UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) { char* name; char* path; diff --git a/channels/sshagent/client/CMakeLists.txt b/channels/sshagent/client/CMakeLists.txt index b7d47e603..7966edc93 100644 --- a/channels/sshagent/client/CMakeLists.txt +++ b/channels/sshagent/client/CMakeLists.txt @@ -26,9 +26,5 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - target_link_libraries(${MODULE_NAME} winpr) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/sshagent/client/sshagent_main.c b/channels/sshagent/client/sshagent_main.c index cc428acd1..8c387b495 100644 --- a/channels/sshagent/client/sshagent_main.c +++ b/channels/sshagent/client/sshagent_main.c @@ -342,18 +342,12 @@ static UINT sshagent_plugin_terminated(IWTSPlugin* pPlugin) return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry sshagent_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Main entry point for sshagent DVC plugin * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT sshagent_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT status = CHANNEL_RC_OK; SSHAGENT_PLUGIN* sshagent; diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt index 8d66db9ee..29a803050 100644 --- a/channels/tsmf/client/CMakeLists.txt +++ b/channels/tsmf/client/CMakeLists.txt @@ -79,10 +79,6 @@ 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 BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") if(WITH_FFMPEG) diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index bef3f5529..ca8509584 100644 --- a/channels/tsmf/client/alsa/tsmf_alsa.c +++ b/channels/tsmf/client/alsa/tsmf_alsa.c @@ -226,14 +226,7 @@ static void tsmf_alsa_free(ITSMFAudioDevice* audio) free(alsa); } -#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 -#endif - -ITSMFAudioDevice* freerdp_tsmf_client_audio_subsystem_entry(void) +ITSMFAudioDevice* alsa_freerdp_tsmf_client_audio_subsystem_entry(void) { TSMFAlsaAudioDevice* alsa; alsa = (TSMFAlsaAudioDevice*)malloc(sizeof(TSMFAlsaAudioDevice)); diff --git a/channels/tsmf/client/ffmpeg/CMakeLists.txt b/channels/tsmf/client/ffmpeg/CMakeLists.txt index e6adc14c9..034cced58 100644 --- a/channels/tsmf/client/ffmpeg/CMakeLists.txt +++ b/channels/tsmf/client/ffmpeg/CMakeLists.txt @@ -25,8 +25,6 @@ include_directories(${FFMPEG_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") - - if(APPLE) # For this to work on apple, we need to add some frameworks FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) @@ -39,7 +37,3 @@ else() target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) endif() -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_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 d76d4356d..84bbc7835 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -621,13 +621,7 @@ static BOOL CALLBACK InitializeAvCodecs(PINIT_ONCE once, PVOID param, PVOID* con return TRUE; } -#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 -#endif - -ITSMFDecoder* freerdp_tsmf_client_subsystem_entry(void) +ITSMFDecoder* ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry(void) { TSMFFFmpegDecoder* decoder; InitOnceExecuteOnce(&g_Initialized, InitializeAvCodecs, NULL, NULL); diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index f303b244a..2baa8dfa5 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -1013,13 +1013,7 @@ static BOOL tsmf_gstreamer_sync(ITSMFDecoder* decoder, void (*cb)(void*), void* return TRUE; } -#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 -#endif - -ITSMFDecoder* freerdp_tsmf_client_subsystem_entry(void) +ITSMFDecoder* gstreamer_freerdp_tsmf_client_decoder_subsystem_entry(void) { TSMFGstreamerDecoder* decoder; diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index 71f01c0c6..e56bde9ff 100644 --- a/channels/tsmf/client/oss/tsmf_oss.c +++ b/channels/tsmf/client/oss/tsmf_oss.c @@ -229,14 +229,7 @@ static void tsmf_oss_free(ITSMFAudioDevice* audio) free(oss); } -#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 -#endif - -ITSMFAudioDevice* freerdp_tsmf_client_audio_subsystem_entry(void) +ITSMFAudioDevice* oss_freerdp_tsmf_client_audio_subsystem_entry(void) { TSMFOssAudioDevice* oss; oss = (TSMFOssAudioDevice*)malloc(sizeof(TSMFOssAudioDevice)); diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index cfa6c11c1..4afb25f19 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -400,11 +400,7 @@ static void tsmf_pulse_free(ITSMFAudioDevice* audio) free(pulse); } -#ifdef BUILTIN_CHANNELS ITSMFAudioDevice* pulse_freerdp_tsmf_client_audio_subsystem_entry(void) -#else -FREERDP_API ITSMFAudioDevice* freerdp_tsmf_client_audio_subsystem_entry(void) -#endif { TSMFPulseAudioDevice* pulse; pulse = (TSMFPulseAudioDevice*)calloc(1, sizeof(TSMFPulseAudioDevice)); diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index 7d4e5dbf2..49e0b0f00 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -553,18 +553,12 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args) return CHANNEL_RC_OK; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry tsmf_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT tsmf_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT status = 0; TSMF_PLUGIN* tsmf; diff --git a/channels/urbdrc/client/CMakeLists.txt b/channels/urbdrc/client/CMakeLists.txt index c014c9624..a2d48f03c 100644 --- a/channels/urbdrc/client/CMakeLists.txt +++ b/channels/urbdrc/client/CMakeLists.txt @@ -18,7 +18,7 @@ define_channel_client("urbdrc") -set(${MODULE_PREFIX}_SRCS +set(${MODULE_PREFIX}_SRCS data_transfer.c data_transfer.h urbdrc_main.c @@ -37,10 +37,6 @@ 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 BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") # libusb subsystem diff --git a/channels/urbdrc/client/libusb/CMakeLists.txt b/channels/urbdrc/client/libusb/CMakeLists.txt index a6304f8b3..5ca3f4481 100644 --- a/channels/urbdrc/client/libusb/CMakeLists.txt +++ b/channels/urbdrc/client/libusb/CMakeLists.txt @@ -40,7 +40,3 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr urbdrc-client) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_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 1a29c3fe4..ebbb5c9fe 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -899,12 +899,7 @@ static DWORD poll_thread(LPVOID lpThreadParameter) return 0; } -#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 -#endif -UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) +UINT libusb_freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) { wObject* obj; UINT rc; diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index ea39756f1..4c0844cb3 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -939,18 +939,13 @@ BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1 idevman->loading_unlock(idevman); return TRUE; } -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry urbdrc_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT urbdrc_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT status = 0; const ADDIN_ARGV* args; diff --git a/channels/video/client/CMakeLists.txt b/channels/video/client/CMakeLists.txt index 925a3359d..3b2e078de 100644 --- a/channels/video/client/CMakeLists.txt +++ b/channels/video/client/CMakeLists.txt @@ -25,18 +25,8 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") - -if(NOT BUILTIN_CHANNELS) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client) -endif() set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - -if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS) - install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols) -endif() - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") diff --git a/channels/video/client/video_main.c b/channels/video/client/video_main.c index dc4abea21..981e51f20 100644 --- a/channels/video/client/video_main.c +++ b/channels/video/client/video_main.c @@ -1161,19 +1161,12 @@ static UINT video_plugin_terminated(IWTSPlugin* pPlugin) /** * Channel Client Interface */ - -#ifdef BUILTIN_CHANNELS -#define DVCPluginEntry video_DVCPluginEntry -#else -#define DVCPluginEntry FREERDP_API DVCPluginEntry -#endif - /** * Function description * * @return 0 on success, otherwise a Win32 error code */ -UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) +UINT video_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) { UINT error = CHANNEL_RC_OK; VIDEO_PLUGIN* videoPlugin; diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index dcb82b5d5..b8c0d45af 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -5,7 +5,6 @@ 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 (BUILTIN_CHANNELS ON CACHE BOOL "static channels") set (WITH_CUPS ON CACHE BOOL "cups") set (WITH_WAYLAND ON CACHE BOOL "wayland") set (WITH_GSSAPI OFF CACHE BOOL "Kerberos support") diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake index a16931039..821457261 100644 --- a/cmake/ConfigOptions.cmake +++ b/cmake/ConfigOptions.cmake @@ -72,8 +72,6 @@ CMAKE_DEPENDENT_OPTION(WITH_CLIENT "Build client binaries" ON "WITH_CLIENT_COMMO option(WITH_SERVER "Build server binaries" OFF) -option(BUILTIN_CHANNELS "Combine all channels into their respective base library" ON) - option(WITH_CHANNELS "Build virtual channel plugins" ON) option(FREERDP_UNIFIED_BUILD "Build WinPR, uwac, RdTk and FreeRDP in one go" ON) diff --git a/config.h.in b/config.h.in index 5c146d381..beeb20fa4 100644 --- a/config.h.in +++ b/config.h.in @@ -63,7 +63,6 @@ #cmakedefine WITH_CHANNEL_RDPAPPLIST /* Plugins */ -#cmakedefine BUILTIN_CHANNELS #cmakedefine WITH_RDPDR /* Channels */ diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index 0c5883f58..cc12ee45e 100755 --- a/packaging/deb/freerdp-nightly/rules +++ b/packaging/deb/freerdp-nightly/rules @@ -10,7 +10,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ -DCMAKE_SKIP_INSTALL_RPATH=FALSE \ -DWITH_PULSE=ON \ -DWITH_CHANNELS=ON \ - -DBUILTIN_CHANNELS=ON \ -DWITH_CUPS=ON \ -DWITH_PCSC=ON \ -DWITH_GSTREAMER_0_10=ON \ diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index 9c2b4bc15..58255301f 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -116,7 +116,6 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version -DCMAKE_SKIP_INSTALL_RPATH=FALSE \ -DWITH_PULSE=ON \ -DWITH_CHANNELS=ON \ - -DBUILTIN_CHANNELS=ON \ -DWITH_CUPS=ON \ -DWITH_PCSC=ON \ -DWITH_JPEG=ON \ diff --git a/rdtk/templates/CMakeLists.txt b/rdtk/templates/CMakeLists.txt index 3433ac9ac..172e2f2d2 100644 --- a/rdtk/templates/CMakeLists.txt +++ b/rdtk/templates/CMakeLists.txt @@ -20,7 +20,7 @@ write_basic_package_version_file( set(RDTK_BUILD_CONFIG_LIST "") GET_CMAKE_PROPERTY(res VARIABLES) FOREACH(var ${res}) - IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*") + IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*") LIST(APPEND RDTK_BUILD_CONFIG_LIST "${var}=${${var}}") ENDIF() ENDFOREACH() diff --git a/server/proxy/CMakeLists.txt b/server/proxy/CMakeLists.txt index 7edcc7223..92f8f16bc 100644 --- a/server/proxy/CMakeLists.txt +++ b/server/proxy/CMakeLists.txt @@ -70,14 +70,6 @@ endif() set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client) -if (NOT BUILTIN_CHANNELS) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client) - get_target_property(CUR_INSTALL_RPATH ${MODULE_NAME} INSTALL_RPATH) - if (NOT APPLE) - set(CUR_INSTALL_RPATH "${CUR_INSTALL_RPATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}") - endif() - set_target_properties(${MODULE_NAME} PROPERTIES INSTALL_RPATH ${CUR_INSTALL_RPATH}) -endif() set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt index 6cce62787..982e3a421 100644 --- a/server/shadow/CMakeLists.txt +++ b/server/shadow/CMakeLists.txt @@ -375,7 +375,3 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfi install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfigVersion.cmake DESTINATION ${FREERDP_SERVER_CMAKE_INSTALL_DIR}) - -if (NOT BUILTIN_CHANNELS) - install(EXPORT FreeRDP-ShadowTargets DESTINATION ${FREERDP_SERVER_CMAKE_INSTALL_DIR}) -endif() diff --git a/uwac/templates/CMakeLists.txt b/uwac/templates/CMakeLists.txt index 4549ed3c8..6a8e39306 100644 --- a/uwac/templates/CMakeLists.txt +++ b/uwac/templates/CMakeLists.txt @@ -25,7 +25,7 @@ install(EXPORT uwac DESTINATION ${UWAC_CMAKE_INSTALL_DIR}) set(UWAC_BUILD_CONFIG_LIST "") GET_CMAKE_PROPERTY(res VARIABLES) FOREACH(var ${res}) - IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*") + IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*") LIST(APPEND UWAC_BUILD_CONFIG_LIST "${var}=${${var}}") ENDIF() ENDFOREACH()