forked from pool/freerdp
7f6b3684ca
Hi Johannes, hopefully I addressed all your concerns correctly, but cheated a bit with the changelog timestamps. I wanted to avoid creating yet another entry, hence combined the latest change with the former ones. Hope, this is still fine for you. Best, Pete - Fix the spec-cleaner mess - Enable a few options on TW - Build for 15.3 required another lib - Remove X264 option, no related backend exists and enabling it fails in cmake creation stage - Reorganize build flags - Apply fix for -DBUILTIN_CHANNELS=OFF: freerdp-builtin-channels-off-link-fix.diff - Add plugins to libwinpr OBS-URL: https://build.opensuse.org/request/show/919271 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=117
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
--- FreeRDP-2.4.0/channels/video/client/CMakeLists.txt~ 2021-07-27 11:58:27.000000000 +0200
|
|
+++ FreeRDP-2.4.0/channels/video/client/CMakeLists.txt 2021-08-20 10:35:04.496719927 +0200
|
|
@@ -26,7 +26,8 @@ include_directories(..)
|
|
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
|
|
|
|
|
|
-
|
|
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
|
|
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client)
|
|
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
|
|
|
|
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
|
|
--- FreeRDP-2.4.0/channels/rdpsnd/client/proxy/CMakeLists.txt~ 2021-07-27 11:58:27.000000000 +0200
|
|
+++ FreeRDP-2.4.0/channels/rdpsnd/client/proxy/CMakeLists.txt 2021-08-20 13:45:38.459395909 +0200
|
|
@@ -25,6 +25,7 @@ include_directories(..)
|
|
|
|
add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")
|
|
|
|
+list(APPEND ${MODULE_PREFIX}_LIBS freerdp-client)
|
|
list(APPEND ${MODULE_PREFIX}_LIBS freerdp)
|
|
list(APPEND ${MODULE_PREFIX}_LIBS winpr)
|
|
|
|
--- FreeRDP-2.4.0/channels/rdp2tcp/client/CMakeLists.txt~ 2021-07-27 11:58:27.000000000 +0200
|
|
+++ FreeRDP-2.4.0/channels/rdp2tcp/client/CMakeLists.txt 2021-08-21 13:15:02.847667180 +0200
|
|
@@ -22,6 +22,6 @@ set(${MODULE_PREFIX}_SRCS
|
|
|
|
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "VirtualChannelEntryEx")
|
|
|
|
-target_link_libraries(${MODULE_NAME} freerdp)
|
|
+target_link_libraries(${MODULE_NAME} winpr freerdp)
|
|
|
|
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
|