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

[channels,rdpsnd] add rdpsnd-common object lib

Browse Source
This commit is contained in:
akallabeth 2023-02-20 10:03:03 +01:00 committed by akallabeth
parent 455f6546a7
commit 0307482506
6 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/CMakeLists.txt
View File

@ -187,7 +187,10 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna
set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
if (${${_module_prefix}_LIBS})
target_link_libraries(${_module_name} PRIVATE ${${_module_prefix}_LIBS})
endif()
if (NOT BUILD_SHARED_LIBS) if (NOT BUILD_SHARED_LIBS)
client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
@ -222,6 +225,10 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna
set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
if (${${_module_prefix}_LIBS})
target_link_libraries(${_module_name} PRIVATE ${${_module_prefix}_LIBS})
endif()
if (NOT BUILD_SHARED_LIBS) if (NOT BUILD_SHARED_LIBS)
server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif() endif()

2
channels/rdpsnd/client/CMakeLists.txt
View File

@ -24,7 +24,7 @@ set(${MODULE_PREFIX}_SRCS
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx;DVCPluginEntry") add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx;DVCPluginEntry")
target_link_libraries(${MODULE_NAME} target_link_libraries(${MODULE_NAME}
winpr freerdp ${CMAKE_THREAD_LIBS_INIT} winpr freerdp ${CMAKE_THREAD_LIBS_INIT} rdpsnd-common
) )
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

4
channels/rdpsnd/common/CMakeLists.txt
View File

@ -21,4 +21,6 @@ set(SRCS
rdpsnd_common.c) rdpsnd_common.c)
# Library currently header only # Library currently header only
#add_library(rdpsnd-common STATIC ${SRCS}) add_library(rdpsnd-common OBJECT ${SRCS})
set_property(TARGET rdpsnd-common PROPERTY POSITION_INDEPENDENT_CODE ON)

21
channels/rdpsnd/common/rdpsnd_common.c Normal file
View File

@ -0,0 +1,21 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Server Audio Virtual Channel
*
* Copyright 2018 Armin Novak <armin.novak@thincast.com>
* Copyright 2018 Thincast Technologies GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "rdpsnd_common.h"

4
channels/rdpsnd/server/CMakeLists.txt
View File

@ -21,6 +21,10 @@ set(${MODULE_PREFIX}_SRCS
rdpsnd_main.c rdpsnd_main.c
rdpsnd_main.h) rdpsnd_main.h)
set(${MODULE_PREFIX}_LIBS
rdpsnd-common
)
add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry")
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server")

2
channels/urbdrc/common/CMakeLists.txt
View File

@ -24,3 +24,5 @@ set(SRCS
msusb.c) msusb.c)
add_library(urbdrc-common OBJECT ${SRCS}) add_library(urbdrc-common OBJECT ${SRCS})
set_property(TARGET urbdrc-common PROPERTY POSITION_INDEPENDENT_CODE ON)