diff --git a/server/proxy/modules/bitmap-filter/CMakeLists.txt b/server/proxy/modules/bitmap-filter/CMakeLists.txt index a57180ffd..7dcb25fce 100644 --- a/server/proxy/modules/bitmap-filter/CMakeLists.txt +++ b/server/proxy/modules/bitmap-filter/CMakeLists.txt @@ -40,6 +40,7 @@ include(CXXCompilerFlags) set(SRCS bitmap-filter.cpp) addtargetwithresourcefile(${PROJECT_NAME} FALSE "${PROJECT_VERSION}" SRCS FALSE) +target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:BUILD_SHARED_LIBS>) target_link_libraries(${PROJECT_NAME} winpr freerdp) installwithrpath(TARGETS ${PROJECT_NAME} DESTINATION ${FREERDP_PROXY_PLUGINDIR}) diff --git a/server/proxy/modules/bitmap-filter/bitmap-filter.cpp b/server/proxy/modules/bitmap-filter/bitmap-filter.cpp index e3777fb0a..a2fb77f95 100644 --- a/server/proxy/modules/bitmap-filter/bitmap-filter.cpp +++ b/server/proxy/modules/bitmap-filter/bitmap-filter.cpp @@ -445,16 +445,7 @@ static BOOL filter_server_session_end(proxyPlugin* plugin, proxyData* pdata, voi return TRUE; } -#ifdef __cplusplus -extern "C" -{ -#endif - FREERDP_API BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata); -#ifdef __cplusplus -} -#endif - -BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) +static BOOL int_proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) { proxyPlugin plugin = {}; @@ -477,3 +468,26 @@ BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userda return plugins_manager->RegisterPlugin(plugins_manager, &plugin); } + +#ifdef __cplusplus +extern "C" +{ +#endif +#if defined(BUILD_SHARED_LIBS) + FREERDP_API BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata); + + BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) + { + return int_proxy_module_entry_point(plugins_manager, userdata); + } +#else +FREERDP_API BOOL demo_proxy_module_entry_point(proxyPluginsManager* plugins_manager, + void* userdata); +BOOL bitmap_filter_proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) +{ + return int_proxy_module_entry_point(plugins_manager, userdata); +} +#endif +#ifdef __cplusplus +} +#endif diff --git a/server/proxy/modules/demo/CMakeLists.txt b/server/proxy/modules/demo/CMakeLists.txt index 18745deec..7deaf3cc1 100644 --- a/server/proxy/modules/demo/CMakeLists.txt +++ b/server/proxy/modules/demo/CMakeLists.txt @@ -40,6 +40,7 @@ include(CXXCompilerFlags) set(SRCS demo.cpp) addtargetwithresourcefile(${PROJECT_NAME} FALSE "${PROJECT_VERSION}" SRCS FALSE) +target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:BUILD_SHARED_LIBS>) target_link_libraries(${PROJECT_NAME} winpr) installwithrpath(TARGETS ${PROJECT_NAME} DESTINATION ${FREERDP_PROXY_PLUGINDIR}) diff --git a/server/proxy/modules/demo/demo.cpp b/server/proxy/modules/demo/demo.cpp index 1b592d761..75a71a007 100644 --- a/server/proxy/modules/demo/demo.cpp +++ b/server/proxy/modules/demo/demo.cpp @@ -408,16 +408,7 @@ static BOOL demo_dyn_channel_intercept([[maybe_unused]] proxyPlugin* plugin, return TRUE; } -#ifdef __cplusplus -extern "C" -{ -#endif - FREERDP_API BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata); -#ifdef __cplusplus -} -#endif - -BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) +static BOOL int_proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) { struct demo_custom_data* custom = nullptr; proxyPlugin plugin = {}; @@ -467,3 +458,26 @@ BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userda return plugins_manager->RegisterPlugin(plugins_manager, &plugin); } + +#ifdef __cplusplus +extern "C" +{ +#endif +#if defined(BUILD_SHARED_LIBS) + FREERDP_API BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata); + + BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) + { + return int_proxy_module_entry_point(plugins_manager, userdata); + } +#else +FREERDP_API BOOL demo_proxy_module_entry_point(proxyPluginsManager* plugins_manager, + void* userdata); +BOOL demo_proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) +{ + return int_proxy_module_entry_point(plugins_manager, userdata); +} +#endif +#ifdef __cplusplus +} +#endif diff --git a/server/proxy/modules/dyn-channel-dump/CMakeLists.txt b/server/proxy/modules/dyn-channel-dump/CMakeLists.txt index 607d2544c..371813e8b 100644 --- a/server/proxy/modules/dyn-channel-dump/CMakeLists.txt +++ b/server/proxy/modules/dyn-channel-dump/CMakeLists.txt @@ -39,6 +39,7 @@ include(ProjectCXXStandard) set(SRCS dyn-channel-dump.cpp) addtargetwithresourcefile(${PROJECT_NAME} FALSE "${PROJECT_VERSION}" SRCS FALSE) +target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:BUILD_SHARED_LIBS>) target_link_libraries(${PROJECT_NAME} PRIVATE winpr freerdp freerdp-client freerdp-server freerdp-server-proxy) installwithrpath(TARGETS ${PROJECT_NAME} DESTINATION ${FREERDP_PROXY_PLUGINDIR}) diff --git a/server/proxy/modules/dyn-channel-dump/dyn-channel-dump.cpp b/server/proxy/modules/dyn-channel-dump/dyn-channel-dump.cpp index 93a480f0d..ff407c55b 100644 --- a/server/proxy/modules/dyn-channel-dump/dyn-channel-dump.cpp +++ b/server/proxy/modules/dyn-channel-dump/dyn-channel-dump.cpp @@ -423,10 +423,7 @@ static BOOL dump_unload(proxyPlugin* plugin) return TRUE; } -extern "C" FREERDP_API BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, - void* userdata); - -BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) +static BOOL int_proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) { proxyPlugin plugin = {}; @@ -448,3 +445,26 @@ BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userda return plugins_manager->RegisterPlugin(plugins_manager, &plugin); } + +#ifdef __cplusplus +extern "C" +{ +#endif +#if defined(BUILD_SHARED_LIBS) + FREERDP_API BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata); + + BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) + { + return int_proxy_module_entry_point(plugins_manager, userdata); + } +#else +FREERDP_API BOOL demo_proxy_module_entry_point(proxyPluginsManager* plugins_manager, + void* userdata); +BOOL dyn_channel_dump_proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) +{ + return int_proxy_module_entry_point(plugins_manager, userdata); +} +#endif +#ifdef __cplusplus +} +#endif