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

channels/smartcard: fix non-monolithic build

Browse Source
This commit is contained in:
Marc-André Moreau 2014-04-05 20:05:51 -04:00
parent 9de2a85f6a
commit 7324ded7a2
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ set(${MODULE_PREFIX}_SRCS
smartcard_pack.h smartcard_pack.h
smartcard_operations.c) smartcard_operations.c)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DeviceServiceEntry")
set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
@ -36,7 +36,7 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD} MONOLITHIC ${MONOLITHIC_BUILD}
MODULE winpr MODULE winpr
MODULES winpr-crt winpr-synch winpr-thread winpr-interlocked winpr-utils) MODULES winpr-crt winpr-smartcard winpr-synch winpr-thread winpr-interlocked winpr-utils)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

3
channels/smartcard/client/smartcard_main.c
View File

@ -195,9 +195,8 @@ static void smartcard_irp_request(DEVICE* device, IRP* irp)
MessageQueue_Post(smartcard->IrpQueue, NULL, 0, (void*) irp, NULL); MessageQueue_Post(smartcard->IrpQueue, NULL, 0, (void*) irp, NULL);
} }
#ifdef STATIC_CHANNELS /* smartcard is always built-in */
#define DeviceServiceEntry smartcard_DeviceServiceEntry #define DeviceServiceEntry smartcard_DeviceServiceEntry
#endif
int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
{ {

2
winpr/libwinpr/smartcard/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SO
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL
MODULE winpr MODULE winpr
MODULES winpr-crt) MODULES winpr-crt winpr-library)
if(MONOLITHIC_BUILD) if(MONOLITHIC_BUILD)
set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE) set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)