mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels: rename WITH_STATIC_PLUGINS to STATIC_CHANNELS

Browse Source
This commit is contained in:
Marc-André Moreau 2012-10-08 22:53:05 -04:00
parent ac7e1a3aea
commit ce71721698
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -65,7 +65,7 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
endif() endif()
if(NOT BUILD_SHARED_LIBS AND WITH_MONOLITHIC_BUILD) if(NOT BUILD_SHARED_LIBS AND WITH_MONOLITHIC_BUILD)
set(WITH_STATIC_PLUGINS ON) set(STATIC_CHANNELS ON)
endif() endif()
# Configure MSVC Runtime # Configure MSVC Runtime

4
channels/disk/client/CMakeLists.txt
View File

@ -30,11 +30,11 @@ if(WIN32)
dirent.h) dirent.h)
endif() endif()
if(MSVC AND (NOT WITH_STATIC_PLUGINS)) if(MSVC AND (NOT STATIC_CHANNELS))
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def) set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
endif() endif()
if(NOT WITH_STATIC_PLUGINS) if(NOT STATIC_CHANNELS)
add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
else() else()
set(${MODULE_PREFIX}_STATIC ON PARENT_SCOPE) set(${MODULE_PREFIX}_STATIC ON PARENT_SCOPE)

2
channels/disk/client/disk_main.c
View File

@ -693,7 +693,7 @@ void disk_register_disk_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, char* na
} }
} }
#ifdef WITH_STATIC_PLUGINS #ifdef STATIC_CHANNELS
#define DeviceServiceEntry disk_DeviceServiceEntry #define DeviceServiceEntry disk_DeviceServiceEntry
#endif #endif

2
channels/printer/client/printer_main.c
View File

@ -300,7 +300,7 @@ void printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* pri
freerdp_thread_start(printer_dev->thread, printer_thread_func, printer_dev); freerdp_thread_start(printer_dev->thread, printer_thread_func, printer_dev);
} }
#ifdef WITH_STATIC_PLUGINS #ifdef STATIC_CHANNELS
int printer_entry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) int printer_entry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
#else #else
int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)

2
client/Windows/CMakeLists.txt
View File

@ -39,7 +39,7 @@ add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS})
if(WITH_MONOLITHIC_BUILD) if(WITH_MONOLITHIC_BUILD)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
if(WITH_RDPDR AND WITH_STATIC_PLUGINS) if(WITH_RDPDR AND STATIC_CHANNELS)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpdr disk printer) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpdr disk printer)
endif() endif()
else() else()

2
config.h.in
View File

@ -37,7 +37,7 @@
#cmakedefine WITH_WIN8 #cmakedefine WITH_WIN8
/* Plugins */ /* Plugins */
#cmakedefine WITH_STATIC_PLUGINS #cmakedefine STATIC_CHANNELS
#cmakedefine WITH_RDPDR #cmakedefine WITH_RDPDR

2
include/freerdp/utils/svc_plugin.h
View File

@ -60,7 +60,7 @@ FREERDP_API int svc_plugin_send_event(rdpSvcPlugin* plugin, RDP_EVENT* event);
#define DEBUG_SVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__) #define DEBUG_SVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif #endif
#ifdef WITH_STATIC_PLUGINS #ifdef STATIC_CHANNELS
#define DEFINE_SVC_PLUGIN_ENTRY(_prefix) int _prefix##_entry(PCHANNEL_ENTRY_POINTS pEntryPoints) #define DEFINE_SVC_PLUGIN_ENTRY(_prefix) int _prefix##_entry(PCHANNEL_ENTRY_POINTS pEntryPoints)
#define DEFINE_DEV_PLUGIN_ENTRY(_prefix) int _prefix##_entry(PCHANNEL_ENTRY_POINTS pEntryPoints) #define DEFINE_DEV_PLUGIN_ENTRY(_prefix) int _prefix##_entry(PCHANNEL_ENTRY_POINTS pEntryPoints)
#define REGISTER_SVC_PLUGIN_ENTRY(_prefix) freerdp_register_static_plugin(#_prefix, "VirtualChannelEntry", _prefix##_entry) #define REGISTER_SVC_PLUGIN_ENTRY(_prefix) freerdp_register_static_plugin(#_prefix, "VirtualChannelEntry", _prefix##_entry)

2
libfreerdp/channels/CMakeLists.txt
View File

@ -32,7 +32,7 @@ endif()
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
if(WITH_STATIC_PLUGINS) if(STATIC_CHANNELS)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-channels-client) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-channels-client)
endif() endif()