Merge branch 'xrdp-ng' of github.com:awakecoding/FreeRDP into xrdp-ng
This commit is contained in:
commit
41f53696d5
@ -31,7 +31,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 winpr-handle winpr-path)
|
MODULES winpr-crt winpr-handle winpr-path winpr-synch)
|
||||||
|
|
||||||
if(MONOLITHIC_BUILD)
|
if(MONOLITHIC_BUILD)
|
||||||
|
|
||||||
|
@ -36,7 +36,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-nt winpr-io winpr-synch)
|
MODULES winpr-nt winpr-io winpr-synch winpr-file winpr-error)
|
||||||
|
|
||||||
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user