From 3d65cb1c27cde772b48150d4a0feb2d86f62c8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sat, 22 Sep 2012 17:46:23 -0400 Subject: [PATCH] channels: moved client-side implementations in client subdirectories --- channels/cliprdr/CMakeLists.txt | 21 +------- channels/cliprdr/client/CMakeLists.txt | 36 +++++++++++++ .../cliprdr/{ => client}/cliprdr_constants.h | 0 .../cliprdr/{ => client}/cliprdr_format.c | 0 .../cliprdr/{ => client}/cliprdr_format.h | 0 channels/cliprdr/{ => client}/cliprdr_main.c | 0 channels/cliprdr/{ => client}/cliprdr_main.h | 0 channels/drdynvc/CMakeLists.txt | 28 +--------- channels/drdynvc/client/CMakeLists.txt | 43 +++++++++++++++ .../drdynvc/{ => client}/audin/CMakeLists.txt | 0 .../{ => client}/audin/alsa/CMakeLists.txt | 0 .../{ => client}/audin/alsa/audin_alsa.c | 0 .../drdynvc/{ => client}/audin/audin_main.c | 0 .../drdynvc/{ => client}/audin/audin_main.h | 0 .../{ => client}/audin/pulse/CMakeLists.txt | 0 .../{ => client}/audin/pulse/audin_pulse.c | 0 channels/drdynvc/{ => client}/drdynvc_main.c | 0 channels/drdynvc/{ => client}/drdynvc_main.h | 0 channels/drdynvc/{ => client}/drdynvc_types.h | 0 channels/drdynvc/{ => client}/dvcman.c | 0 channels/drdynvc/{ => client}/dvcman.h | 0 .../drdynvc/{ => client}/tsmf/CMakeLists.txt | 0 .../{ => client}/tsmf/alsa/CMakeLists.txt | 0 .../{ => client}/tsmf/alsa/tsmf_alsa.c | 0 .../{ => client}/tsmf/ffmpeg/CMakeLists.txt | 0 .../{ => client}/tsmf/ffmpeg/tsmf_ffmpeg.c | 0 .../tsmf/gstreamer/CMakeLists.txt | 0 .../tsmf/gstreamer/tsmf_gstreamer.c | 0 .../{ => client}/tsmf/pulse/CMakeLists.txt | 0 .../{ => client}/tsmf/pulse/tsmf_pulse.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_audio.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_audio.h | 0 .../drdynvc/{ => client}/tsmf/tsmf_codec.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_codec.h | 0 .../{ => client}/tsmf/tsmf_constants.h | 0 .../drdynvc/{ => client}/tsmf/tsmf_decoder.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_decoder.h | 0 .../drdynvc/{ => client}/tsmf/tsmf_ifman.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_ifman.h | 0 .../drdynvc/{ => client}/tsmf/tsmf_main.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_main.h | 0 .../drdynvc/{ => client}/tsmf/tsmf_media.c | 0 .../drdynvc/{ => client}/tsmf/tsmf_media.h | 0 .../drdynvc/{ => client}/tsmf/tsmf_types.h | 0 channels/rail/CMakeLists.txt | 21 +------- channels/rail/client/CMakeLists.txt | 36 +++++++++++++ channels/rail/{ => client}/rail_main.c | 0 channels/rail/{ => client}/rail_main.h | 0 channels/rail/{ => client}/rail_orders.c | 0 channels/rail/{ => client}/rail_orders.h | 0 channels/rdpdr/CMakeLists.txt | 37 +------------ channels/rdpdr/client/CMakeLists.txt | 52 +++++++++++++++++++ channels/rdpdr/{ => client}/devman.c | 0 channels/rdpdr/{ => client}/devman.h | 0 .../rdpdr/{ => client}/disk/CMakeLists.txt | 0 channels/rdpdr/{ => client}/disk/disk_file.c | 0 channels/rdpdr/{ => client}/disk/disk_file.h | 0 channels/rdpdr/{ => client}/disk/disk_main.c | 0 channels/rdpdr/{ => client}/irp.c | 0 channels/rdpdr/{ => client}/irp.h | 0 .../{ => client}/parallel/CMakeLists.txt | 0 .../{ => client}/parallel/parallel_main.c | 0 .../rdpdr/{ => client}/printer/CMakeLists.txt | 0 .../rdpdr/{ => client}/printer/printer_cups.c | 0 .../rdpdr/{ => client}/printer/printer_cups.h | 0 .../rdpdr/{ => client}/printer/printer_main.c | 0 .../rdpdr/{ => client}/printer/printer_main.h | 0 .../rdpdr/{ => client}/rdpdr_capabilities.c | 0 .../rdpdr/{ => client}/rdpdr_capabilities.h | 0 channels/rdpdr/{ => client}/rdpdr_constants.h | 0 channels/rdpdr/{ => client}/rdpdr_main.c | 0 channels/rdpdr/{ => client}/rdpdr_main.h | 0 channels/rdpdr/{ => client}/rdpdr_types.h | 0 .../rdpdr/{ => client}/serial/CMakeLists.txt | 0 .../{ => client}/serial/serial_constants.h | 0 .../rdpdr/{ => client}/serial/serial_main.c | 0 .../rdpdr/{ => client}/serial/serial_tty.c | 0 .../rdpdr/{ => client}/serial/serial_tty.h | 0 .../{ => client}/smartcard/CMakeLists.txt | 0 .../rdpdr/{ => client}/smartcard/scard_main.c | 0 .../rdpdr/{ => client}/smartcard/scard_main.h | 0 .../{ => client}/smartcard/scard_operations.c | 0 channels/rdpsnd/CMakeLists.txt | 31 +---------- channels/rdpsnd/client/CMakeLists.txt | 46 ++++++++++++++++ .../rdpsnd/{ => client}/alsa/CMakeLists.txt | 0 .../rdpsnd/{ => client}/alsa/rdpsnd_alsa.c | 0 .../{ => client}/mac_audio/CMakeLists.txt | 0 .../{ => client}/mac_audio/rdpsnd_audio_q.c | 0 .../rdpsnd/{ => client}/pulse/CMakeLists.txt | 0 .../rdpsnd/{ => client}/pulse/rdpsnd_pulse.c | 0 channels/rdpsnd/{ => client}/rdpsnd_main.c | 0 channels/rdpsnd/{ => client}/rdpsnd_main.h | 0 channels/skel/CMakeLists.txt | 18 +------ channels/skel/client/CMakeLists.txt | 33 ++++++++++++ channels/skel/{ => client}/readme.txt | 0 .../skel/{ => client}/server_chan_test.cpp | 0 channels/skel/{ => client}/skel_main.c | 0 channels/skel/{ => client}/skel_main.h | 0 98 files changed, 258 insertions(+), 144 deletions(-) create mode 100644 channels/cliprdr/client/CMakeLists.txt rename channels/cliprdr/{ => client}/cliprdr_constants.h (100%) rename channels/cliprdr/{ => client}/cliprdr_format.c (100%) rename channels/cliprdr/{ => client}/cliprdr_format.h (100%) rename channels/cliprdr/{ => client}/cliprdr_main.c (100%) rename channels/cliprdr/{ => client}/cliprdr_main.h (100%) create mode 100644 channels/drdynvc/client/CMakeLists.txt rename channels/drdynvc/{ => client}/audin/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/audin/alsa/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/audin/alsa/audin_alsa.c (100%) rename channels/drdynvc/{ => client}/audin/audin_main.c (100%) rename channels/drdynvc/{ => client}/audin/audin_main.h (100%) rename channels/drdynvc/{ => client}/audin/pulse/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/audin/pulse/audin_pulse.c (100%) rename channels/drdynvc/{ => client}/drdynvc_main.c (100%) rename channels/drdynvc/{ => client}/drdynvc_main.h (100%) rename channels/drdynvc/{ => client}/drdynvc_types.h (100%) rename channels/drdynvc/{ => client}/dvcman.c (100%) rename channels/drdynvc/{ => client}/dvcman.h (100%) rename channels/drdynvc/{ => client}/tsmf/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/tsmf/alsa/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/tsmf/alsa/tsmf_alsa.c (100%) rename channels/drdynvc/{ => client}/tsmf/ffmpeg/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/tsmf/ffmpeg/tsmf_ffmpeg.c (100%) rename channels/drdynvc/{ => client}/tsmf/gstreamer/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/tsmf/gstreamer/tsmf_gstreamer.c (100%) rename channels/drdynvc/{ => client}/tsmf/pulse/CMakeLists.txt (100%) rename channels/drdynvc/{ => client}/tsmf/pulse/tsmf_pulse.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_audio.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_audio.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_codec.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_codec.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_constants.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_decoder.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_decoder.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_ifman.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_ifman.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_main.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_main.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_media.c (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_media.h (100%) rename channels/drdynvc/{ => client}/tsmf/tsmf_types.h (100%) create mode 100644 channels/rail/client/CMakeLists.txt rename channels/rail/{ => client}/rail_main.c (100%) rename channels/rail/{ => client}/rail_main.h (100%) rename channels/rail/{ => client}/rail_orders.c (100%) rename channels/rail/{ => client}/rail_orders.h (100%) create mode 100644 channels/rdpdr/client/CMakeLists.txt rename channels/rdpdr/{ => client}/devman.c (100%) rename channels/rdpdr/{ => client}/devman.h (100%) rename channels/rdpdr/{ => client}/disk/CMakeLists.txt (100%) rename channels/rdpdr/{ => client}/disk/disk_file.c (100%) rename channels/rdpdr/{ => client}/disk/disk_file.h (100%) rename channels/rdpdr/{ => client}/disk/disk_main.c (100%) rename channels/rdpdr/{ => client}/irp.c (100%) rename channels/rdpdr/{ => client}/irp.h (100%) rename channels/rdpdr/{ => client}/parallel/CMakeLists.txt (100%) rename channels/rdpdr/{ => client}/parallel/parallel_main.c (100%) rename channels/rdpdr/{ => client}/printer/CMakeLists.txt (100%) rename channels/rdpdr/{ => client}/printer/printer_cups.c (100%) rename channels/rdpdr/{ => client}/printer/printer_cups.h (100%) rename channels/rdpdr/{ => client}/printer/printer_main.c (100%) rename channels/rdpdr/{ => client}/printer/printer_main.h (100%) rename channels/rdpdr/{ => client}/rdpdr_capabilities.c (100%) rename channels/rdpdr/{ => client}/rdpdr_capabilities.h (100%) rename channels/rdpdr/{ => client}/rdpdr_constants.h (100%) rename channels/rdpdr/{ => client}/rdpdr_main.c (100%) rename channels/rdpdr/{ => client}/rdpdr_main.h (100%) rename channels/rdpdr/{ => client}/rdpdr_types.h (100%) rename channels/rdpdr/{ => client}/serial/CMakeLists.txt (100%) rename channels/rdpdr/{ => client}/serial/serial_constants.h (100%) rename channels/rdpdr/{ => client}/serial/serial_main.c (100%) rename channels/rdpdr/{ => client}/serial/serial_tty.c (100%) rename channels/rdpdr/{ => client}/serial/serial_tty.h (100%) rename channels/rdpdr/{ => client}/smartcard/CMakeLists.txt (100%) rename channels/rdpdr/{ => client}/smartcard/scard_main.c (100%) rename channels/rdpdr/{ => client}/smartcard/scard_main.h (100%) rename channels/rdpdr/{ => client}/smartcard/scard_operations.c (100%) create mode 100644 channels/rdpsnd/client/CMakeLists.txt rename channels/rdpsnd/{ => client}/alsa/CMakeLists.txt (100%) rename channels/rdpsnd/{ => client}/alsa/rdpsnd_alsa.c (100%) rename channels/rdpsnd/{ => client}/mac_audio/CMakeLists.txt (100%) rename channels/rdpsnd/{ => client}/mac_audio/rdpsnd_audio_q.c (100%) rename channels/rdpsnd/{ => client}/pulse/CMakeLists.txt (100%) rename channels/rdpsnd/{ => client}/pulse/rdpsnd_pulse.c (100%) rename channels/rdpsnd/{ => client}/rdpsnd_main.c (100%) rename channels/rdpsnd/{ => client}/rdpsnd_main.h (100%) create mode 100644 channels/skel/client/CMakeLists.txt rename channels/skel/{ => client}/readme.txt (100%) rename channels/skel/{ => client}/server_chan_test.cpp (100%) rename channels/skel/{ => client}/skel_main.c (100%) rename channels/skel/{ => client}/skel_main.h (100%) diff --git a/channels/cliprdr/CMakeLists.txt b/channels/cliprdr/CMakeLists.txt index 5c30a67ef..e6e70054d 100644 --- a/channels/cliprdr/CMakeLists.txt +++ b/channels/cliprdr/CMakeLists.txt @@ -1,9 +1,7 @@ # FreeRDP: A Remote Desktop Protocol Client # FreeRDP cmake build script # -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau +# Copyright 2012 Marc-Andre Moreau # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,20 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(CLIPRDR_SRCS - cliprdr_constants.h - cliprdr_format.c - cliprdr_format.h - cliprdr_main.c - cliprdr_main.h) +add_subdirectory(client) -add_library(cliprdr ${CLIPRDR_SRCS}) -set_target_properties(cliprdr PROPERTIES PREFIX "") - -if(WITH_MONOLITHIC_BUILD) - target_link_libraries(cliprdr freerdp) -else() - target_link_libraries(cliprdr freerdp-utils) -endif() - -install(TARGETS cliprdr DESTINATION ${FREERDP_PLUGIN_PATH}) diff --git a/channels/cliprdr/client/CMakeLists.txt b/channels/cliprdr/client/CMakeLists.txt new file mode 100644 index 000000000..5c30a67ef --- /dev/null +++ b/channels/cliprdr/client/CMakeLists.txt @@ -0,0 +1,36 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# 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. + +set(CLIPRDR_SRCS + cliprdr_constants.h + cliprdr_format.c + cliprdr_format.h + cliprdr_main.c + cliprdr_main.h) + +add_library(cliprdr ${CLIPRDR_SRCS}) +set_target_properties(cliprdr PROPERTIES PREFIX "") + +if(WITH_MONOLITHIC_BUILD) + target_link_libraries(cliprdr freerdp) +else() + target_link_libraries(cliprdr freerdp-utils) +endif() + +install(TARGETS cliprdr DESTINATION ${FREERDP_PLUGIN_PATH}) diff --git a/channels/cliprdr/cliprdr_constants.h b/channels/cliprdr/client/cliprdr_constants.h similarity index 100% rename from channels/cliprdr/cliprdr_constants.h rename to channels/cliprdr/client/cliprdr_constants.h diff --git a/channels/cliprdr/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c similarity index 100% rename from channels/cliprdr/cliprdr_format.c rename to channels/cliprdr/client/cliprdr_format.c diff --git a/channels/cliprdr/cliprdr_format.h b/channels/cliprdr/client/cliprdr_format.h similarity index 100% rename from channels/cliprdr/cliprdr_format.h rename to channels/cliprdr/client/cliprdr_format.h diff --git a/channels/cliprdr/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c similarity index 100% rename from channels/cliprdr/cliprdr_main.c rename to channels/cliprdr/client/cliprdr_main.c diff --git a/channels/cliprdr/cliprdr_main.h b/channels/cliprdr/client/cliprdr_main.h similarity index 100% rename from channels/cliprdr/cliprdr_main.h rename to channels/cliprdr/client/cliprdr_main.h diff --git a/channels/drdynvc/CMakeLists.txt b/channels/drdynvc/CMakeLists.txt index b1deab049..e6e70054d 100644 --- a/channels/drdynvc/CMakeLists.txt +++ b/channels/drdynvc/CMakeLists.txt @@ -1,9 +1,7 @@ # FreeRDP: A Remote Desktop Protocol Client # FreeRDP cmake build script # -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau +# Copyright 2012 Marc-Andre Moreau # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,27 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(DRDYNVC_SRCS - drdynvc_main.c - drdynvc_main.h - drdynvc_types.h - dvcman.c - dvcman.h -) +add_subdirectory(client) -add_library(drdynvc ${DRDYNVC_SRCS}) -set_target_properties(drdynvc PROPERTIES PREFIX "") - -if(WITH_MONOLITHIC_BUILD) - target_link_libraries(drdynvc freerdp) -else() - target_link_libraries(drdynvc freerdp-utils) -endif() - -install(TARGETS drdynvc DESTINATION ${FREERDP_PLUGIN_PATH}) - -if(NOT WIN32) - add_subdirectory(tsmf) -endif() - -add_subdirectory(audin) diff --git a/channels/drdynvc/client/CMakeLists.txt b/channels/drdynvc/client/CMakeLists.txt new file mode 100644 index 000000000..b1deab049 --- /dev/null +++ b/channels/drdynvc/client/CMakeLists.txt @@ -0,0 +1,43 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# 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. + +set(DRDYNVC_SRCS + drdynvc_main.c + drdynvc_main.h + drdynvc_types.h + dvcman.c + dvcman.h +) + +add_library(drdynvc ${DRDYNVC_SRCS}) +set_target_properties(drdynvc PROPERTIES PREFIX "") + +if(WITH_MONOLITHIC_BUILD) + target_link_libraries(drdynvc freerdp) +else() + target_link_libraries(drdynvc freerdp-utils) +endif() + +install(TARGETS drdynvc DESTINATION ${FREERDP_PLUGIN_PATH}) + +if(NOT WIN32) + add_subdirectory(tsmf) +endif() + +add_subdirectory(audin) diff --git a/channels/drdynvc/audin/CMakeLists.txt b/channels/drdynvc/client/audin/CMakeLists.txt similarity index 100% rename from channels/drdynvc/audin/CMakeLists.txt rename to channels/drdynvc/client/audin/CMakeLists.txt diff --git a/channels/drdynvc/audin/alsa/CMakeLists.txt b/channels/drdynvc/client/audin/alsa/CMakeLists.txt similarity index 100% rename from channels/drdynvc/audin/alsa/CMakeLists.txt rename to channels/drdynvc/client/audin/alsa/CMakeLists.txt diff --git a/channels/drdynvc/audin/alsa/audin_alsa.c b/channels/drdynvc/client/audin/alsa/audin_alsa.c similarity index 100% rename from channels/drdynvc/audin/alsa/audin_alsa.c rename to channels/drdynvc/client/audin/alsa/audin_alsa.c diff --git a/channels/drdynvc/audin/audin_main.c b/channels/drdynvc/client/audin/audin_main.c similarity index 100% rename from channels/drdynvc/audin/audin_main.c rename to channels/drdynvc/client/audin/audin_main.c diff --git a/channels/drdynvc/audin/audin_main.h b/channels/drdynvc/client/audin/audin_main.h similarity index 100% rename from channels/drdynvc/audin/audin_main.h rename to channels/drdynvc/client/audin/audin_main.h diff --git a/channels/drdynvc/audin/pulse/CMakeLists.txt b/channels/drdynvc/client/audin/pulse/CMakeLists.txt similarity index 100% rename from channels/drdynvc/audin/pulse/CMakeLists.txt rename to channels/drdynvc/client/audin/pulse/CMakeLists.txt diff --git a/channels/drdynvc/audin/pulse/audin_pulse.c b/channels/drdynvc/client/audin/pulse/audin_pulse.c similarity index 100% rename from channels/drdynvc/audin/pulse/audin_pulse.c rename to channels/drdynvc/client/audin/pulse/audin_pulse.c diff --git a/channels/drdynvc/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c similarity index 100% rename from channels/drdynvc/drdynvc_main.c rename to channels/drdynvc/client/drdynvc_main.c diff --git a/channels/drdynvc/drdynvc_main.h b/channels/drdynvc/client/drdynvc_main.h similarity index 100% rename from channels/drdynvc/drdynvc_main.h rename to channels/drdynvc/client/drdynvc_main.h diff --git a/channels/drdynvc/drdynvc_types.h b/channels/drdynvc/client/drdynvc_types.h similarity index 100% rename from channels/drdynvc/drdynvc_types.h rename to channels/drdynvc/client/drdynvc_types.h diff --git a/channels/drdynvc/dvcman.c b/channels/drdynvc/client/dvcman.c similarity index 100% rename from channels/drdynvc/dvcman.c rename to channels/drdynvc/client/dvcman.c diff --git a/channels/drdynvc/dvcman.h b/channels/drdynvc/client/dvcman.h similarity index 100% rename from channels/drdynvc/dvcman.h rename to channels/drdynvc/client/dvcman.h diff --git a/channels/drdynvc/tsmf/CMakeLists.txt b/channels/drdynvc/client/tsmf/CMakeLists.txt similarity index 100% rename from channels/drdynvc/tsmf/CMakeLists.txt rename to channels/drdynvc/client/tsmf/CMakeLists.txt diff --git a/channels/drdynvc/tsmf/alsa/CMakeLists.txt b/channels/drdynvc/client/tsmf/alsa/CMakeLists.txt similarity index 100% rename from channels/drdynvc/tsmf/alsa/CMakeLists.txt rename to channels/drdynvc/client/tsmf/alsa/CMakeLists.txt diff --git a/channels/drdynvc/tsmf/alsa/tsmf_alsa.c b/channels/drdynvc/client/tsmf/alsa/tsmf_alsa.c similarity index 100% rename from channels/drdynvc/tsmf/alsa/tsmf_alsa.c rename to channels/drdynvc/client/tsmf/alsa/tsmf_alsa.c diff --git a/channels/drdynvc/tsmf/ffmpeg/CMakeLists.txt b/channels/drdynvc/client/tsmf/ffmpeg/CMakeLists.txt similarity index 100% rename from channels/drdynvc/tsmf/ffmpeg/CMakeLists.txt rename to channels/drdynvc/client/tsmf/ffmpeg/CMakeLists.txt diff --git a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/client/tsmf/ffmpeg/tsmf_ffmpeg.c similarity index 100% rename from channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c rename to channels/drdynvc/client/tsmf/ffmpeg/tsmf_ffmpeg.c diff --git a/channels/drdynvc/tsmf/gstreamer/CMakeLists.txt b/channels/drdynvc/client/tsmf/gstreamer/CMakeLists.txt similarity index 100% rename from channels/drdynvc/tsmf/gstreamer/CMakeLists.txt rename to channels/drdynvc/client/tsmf/gstreamer/CMakeLists.txt diff --git a/channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c b/channels/drdynvc/client/tsmf/gstreamer/tsmf_gstreamer.c similarity index 100% rename from channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c rename to channels/drdynvc/client/tsmf/gstreamer/tsmf_gstreamer.c diff --git a/channels/drdynvc/tsmf/pulse/CMakeLists.txt b/channels/drdynvc/client/tsmf/pulse/CMakeLists.txt similarity index 100% rename from channels/drdynvc/tsmf/pulse/CMakeLists.txt rename to channels/drdynvc/client/tsmf/pulse/CMakeLists.txt diff --git a/channels/drdynvc/tsmf/pulse/tsmf_pulse.c b/channels/drdynvc/client/tsmf/pulse/tsmf_pulse.c similarity index 100% rename from channels/drdynvc/tsmf/pulse/tsmf_pulse.c rename to channels/drdynvc/client/tsmf/pulse/tsmf_pulse.c diff --git a/channels/drdynvc/tsmf/tsmf_audio.c b/channels/drdynvc/client/tsmf/tsmf_audio.c similarity index 100% rename from channels/drdynvc/tsmf/tsmf_audio.c rename to channels/drdynvc/client/tsmf/tsmf_audio.c diff --git a/channels/drdynvc/tsmf/tsmf_audio.h b/channels/drdynvc/client/tsmf/tsmf_audio.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_audio.h rename to channels/drdynvc/client/tsmf/tsmf_audio.h diff --git a/channels/drdynvc/tsmf/tsmf_codec.c b/channels/drdynvc/client/tsmf/tsmf_codec.c similarity index 100% rename from channels/drdynvc/tsmf/tsmf_codec.c rename to channels/drdynvc/client/tsmf/tsmf_codec.c diff --git a/channels/drdynvc/tsmf/tsmf_codec.h b/channels/drdynvc/client/tsmf/tsmf_codec.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_codec.h rename to channels/drdynvc/client/tsmf/tsmf_codec.h diff --git a/channels/drdynvc/tsmf/tsmf_constants.h b/channels/drdynvc/client/tsmf/tsmf_constants.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_constants.h rename to channels/drdynvc/client/tsmf/tsmf_constants.h diff --git a/channels/drdynvc/tsmf/tsmf_decoder.c b/channels/drdynvc/client/tsmf/tsmf_decoder.c similarity index 100% rename from channels/drdynvc/tsmf/tsmf_decoder.c rename to channels/drdynvc/client/tsmf/tsmf_decoder.c diff --git a/channels/drdynvc/tsmf/tsmf_decoder.h b/channels/drdynvc/client/tsmf/tsmf_decoder.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_decoder.h rename to channels/drdynvc/client/tsmf/tsmf_decoder.h diff --git a/channels/drdynvc/tsmf/tsmf_ifman.c b/channels/drdynvc/client/tsmf/tsmf_ifman.c similarity index 100% rename from channels/drdynvc/tsmf/tsmf_ifman.c rename to channels/drdynvc/client/tsmf/tsmf_ifman.c diff --git a/channels/drdynvc/tsmf/tsmf_ifman.h b/channels/drdynvc/client/tsmf/tsmf_ifman.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_ifman.h rename to channels/drdynvc/client/tsmf/tsmf_ifman.h diff --git a/channels/drdynvc/tsmf/tsmf_main.c b/channels/drdynvc/client/tsmf/tsmf_main.c similarity index 100% rename from channels/drdynvc/tsmf/tsmf_main.c rename to channels/drdynvc/client/tsmf/tsmf_main.c diff --git a/channels/drdynvc/tsmf/tsmf_main.h b/channels/drdynvc/client/tsmf/tsmf_main.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_main.h rename to channels/drdynvc/client/tsmf/tsmf_main.h diff --git a/channels/drdynvc/tsmf/tsmf_media.c b/channels/drdynvc/client/tsmf/tsmf_media.c similarity index 100% rename from channels/drdynvc/tsmf/tsmf_media.c rename to channels/drdynvc/client/tsmf/tsmf_media.c diff --git a/channels/drdynvc/tsmf/tsmf_media.h b/channels/drdynvc/client/tsmf/tsmf_media.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_media.h rename to channels/drdynvc/client/tsmf/tsmf_media.h diff --git a/channels/drdynvc/tsmf/tsmf_types.h b/channels/drdynvc/client/tsmf/tsmf_types.h similarity index 100% rename from channels/drdynvc/tsmf/tsmf_types.h rename to channels/drdynvc/client/tsmf/tsmf_types.h diff --git a/channels/rail/CMakeLists.txt b/channels/rail/CMakeLists.txt index 6e6a45441..e6e70054d 100644 --- a/channels/rail/CMakeLists.txt +++ b/channels/rail/CMakeLists.txt @@ -1,9 +1,7 @@ # FreeRDP: A Remote Desktop Protocol Client # FreeRDP cmake build script # -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau +# Copyright 2012 Marc-Andre Moreau # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,20 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(RAIL_SRCS - rail_main.c - rail_main.h - rail_orders.c - rail_orders.h) - -add_library(rail ${RAIL_SRCS}) -set_target_properties(rail PROPERTIES PREFIX "") - -if(WITH_MONOLITHIC_BUILD) - target_link_libraries(rail freerdp) -else() - target_link_libraries(rail freerdp-utils) -endif() - -install(TARGETS rail DESTINATION ${FREERDP_PLUGIN_PATH}) +add_subdirectory(client) diff --git a/channels/rail/client/CMakeLists.txt b/channels/rail/client/CMakeLists.txt new file mode 100644 index 000000000..6e6a45441 --- /dev/null +++ b/channels/rail/client/CMakeLists.txt @@ -0,0 +1,36 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# 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. + +set(RAIL_SRCS + rail_main.c + rail_main.h + rail_orders.c + rail_orders.h) + +add_library(rail ${RAIL_SRCS}) +set_target_properties(rail PROPERTIES PREFIX "") + +if(WITH_MONOLITHIC_BUILD) + target_link_libraries(rail freerdp) +else() + target_link_libraries(rail freerdp-utils) +endif() + +install(TARGETS rail DESTINATION ${FREERDP_PLUGIN_PATH}) + diff --git a/channels/rail/rail_main.c b/channels/rail/client/rail_main.c similarity index 100% rename from channels/rail/rail_main.c rename to channels/rail/client/rail_main.c diff --git a/channels/rail/rail_main.h b/channels/rail/client/rail_main.h similarity index 100% rename from channels/rail/rail_main.h rename to channels/rail/client/rail_main.h diff --git a/channels/rail/rail_orders.c b/channels/rail/client/rail_orders.c similarity index 100% rename from channels/rail/rail_orders.c rename to channels/rail/client/rail_orders.c diff --git a/channels/rail/rail_orders.h b/channels/rail/client/rail_orders.h similarity index 100% rename from channels/rail/rail_orders.h rename to channels/rail/client/rail_orders.h diff --git a/channels/rdpdr/CMakeLists.txt b/channels/rdpdr/CMakeLists.txt index 55b0e09ba..e6e70054d 100644 --- a/channels/rdpdr/CMakeLists.txt +++ b/channels/rdpdr/CMakeLists.txt @@ -1,9 +1,7 @@ # FreeRDP: A Remote Desktop Protocol Client # FreeRDP cmake build script # -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau +# Copyright 2012 Marc-Andre Moreau # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,36 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(RDPDR_SRCS - rdpdr_constants.h - rdpdr_types.h - rdpdr_capabilities.c - rdpdr_capabilities.h - devman.c - devman.h - irp.c - irp.h - rdpdr_main.c - rdpdr_main.h) +add_subdirectory(client) -add_library(rdpdr ${RDPDR_SRCS}) -set_target_properties(rdpdr PROPERTIES PREFIX "") - -if(WITH_MONOLITHIC_BUILD) - target_link_libraries(rdpdr freerdp) -else() - target_link_libraries(rdpdr freerdp-utils) -endif() - -install(TARGETS rdpdr DESTINATION ${FREERDP_PLUGIN_PATH}) - -if(NOT WIN32) - add_subdirectory(disk) - add_subdirectory(printer) - add_subdirectory(parallel) - add_subdirectory(serial) -endif() - -if(WITH_PCSC) - add_subdirectory(smartcard) -endif() diff --git a/channels/rdpdr/client/CMakeLists.txt b/channels/rdpdr/client/CMakeLists.txt new file mode 100644 index 000000000..55b0e09ba --- /dev/null +++ b/channels/rdpdr/client/CMakeLists.txt @@ -0,0 +1,52 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# 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. + +set(RDPDR_SRCS + rdpdr_constants.h + rdpdr_types.h + rdpdr_capabilities.c + rdpdr_capabilities.h + devman.c + devman.h + irp.c + irp.h + rdpdr_main.c + rdpdr_main.h) + +add_library(rdpdr ${RDPDR_SRCS}) +set_target_properties(rdpdr PROPERTIES PREFIX "") + +if(WITH_MONOLITHIC_BUILD) + target_link_libraries(rdpdr freerdp) +else() + target_link_libraries(rdpdr freerdp-utils) +endif() + +install(TARGETS rdpdr DESTINATION ${FREERDP_PLUGIN_PATH}) + +if(NOT WIN32) + add_subdirectory(disk) + add_subdirectory(printer) + add_subdirectory(parallel) + add_subdirectory(serial) +endif() + +if(WITH_PCSC) + add_subdirectory(smartcard) +endif() diff --git a/channels/rdpdr/devman.c b/channels/rdpdr/client/devman.c similarity index 100% rename from channels/rdpdr/devman.c rename to channels/rdpdr/client/devman.c diff --git a/channels/rdpdr/devman.h b/channels/rdpdr/client/devman.h similarity index 100% rename from channels/rdpdr/devman.h rename to channels/rdpdr/client/devman.h diff --git a/channels/rdpdr/disk/CMakeLists.txt b/channels/rdpdr/client/disk/CMakeLists.txt similarity index 100% rename from channels/rdpdr/disk/CMakeLists.txt rename to channels/rdpdr/client/disk/CMakeLists.txt diff --git a/channels/rdpdr/disk/disk_file.c b/channels/rdpdr/client/disk/disk_file.c similarity index 100% rename from channels/rdpdr/disk/disk_file.c rename to channels/rdpdr/client/disk/disk_file.c diff --git a/channels/rdpdr/disk/disk_file.h b/channels/rdpdr/client/disk/disk_file.h similarity index 100% rename from channels/rdpdr/disk/disk_file.h rename to channels/rdpdr/client/disk/disk_file.h diff --git a/channels/rdpdr/disk/disk_main.c b/channels/rdpdr/client/disk/disk_main.c similarity index 100% rename from channels/rdpdr/disk/disk_main.c rename to channels/rdpdr/client/disk/disk_main.c diff --git a/channels/rdpdr/irp.c b/channels/rdpdr/client/irp.c similarity index 100% rename from channels/rdpdr/irp.c rename to channels/rdpdr/client/irp.c diff --git a/channels/rdpdr/irp.h b/channels/rdpdr/client/irp.h similarity index 100% rename from channels/rdpdr/irp.h rename to channels/rdpdr/client/irp.h diff --git a/channels/rdpdr/parallel/CMakeLists.txt b/channels/rdpdr/client/parallel/CMakeLists.txt similarity index 100% rename from channels/rdpdr/parallel/CMakeLists.txt rename to channels/rdpdr/client/parallel/CMakeLists.txt diff --git a/channels/rdpdr/parallel/parallel_main.c b/channels/rdpdr/client/parallel/parallel_main.c similarity index 100% rename from channels/rdpdr/parallel/parallel_main.c rename to channels/rdpdr/client/parallel/parallel_main.c diff --git a/channels/rdpdr/printer/CMakeLists.txt b/channels/rdpdr/client/printer/CMakeLists.txt similarity index 100% rename from channels/rdpdr/printer/CMakeLists.txt rename to channels/rdpdr/client/printer/CMakeLists.txt diff --git a/channels/rdpdr/printer/printer_cups.c b/channels/rdpdr/client/printer/printer_cups.c similarity index 100% rename from channels/rdpdr/printer/printer_cups.c rename to channels/rdpdr/client/printer/printer_cups.c diff --git a/channels/rdpdr/printer/printer_cups.h b/channels/rdpdr/client/printer/printer_cups.h similarity index 100% rename from channels/rdpdr/printer/printer_cups.h rename to channels/rdpdr/client/printer/printer_cups.h diff --git a/channels/rdpdr/printer/printer_main.c b/channels/rdpdr/client/printer/printer_main.c similarity index 100% rename from channels/rdpdr/printer/printer_main.c rename to channels/rdpdr/client/printer/printer_main.c diff --git a/channels/rdpdr/printer/printer_main.h b/channels/rdpdr/client/printer/printer_main.h similarity index 100% rename from channels/rdpdr/printer/printer_main.h rename to channels/rdpdr/client/printer/printer_main.h diff --git a/channels/rdpdr/rdpdr_capabilities.c b/channels/rdpdr/client/rdpdr_capabilities.c similarity index 100% rename from channels/rdpdr/rdpdr_capabilities.c rename to channels/rdpdr/client/rdpdr_capabilities.c diff --git a/channels/rdpdr/rdpdr_capabilities.h b/channels/rdpdr/client/rdpdr_capabilities.h similarity index 100% rename from channels/rdpdr/rdpdr_capabilities.h rename to channels/rdpdr/client/rdpdr_capabilities.h diff --git a/channels/rdpdr/rdpdr_constants.h b/channels/rdpdr/client/rdpdr_constants.h similarity index 100% rename from channels/rdpdr/rdpdr_constants.h rename to channels/rdpdr/client/rdpdr_constants.h diff --git a/channels/rdpdr/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c similarity index 100% rename from channels/rdpdr/rdpdr_main.c rename to channels/rdpdr/client/rdpdr_main.c diff --git a/channels/rdpdr/rdpdr_main.h b/channels/rdpdr/client/rdpdr_main.h similarity index 100% rename from channels/rdpdr/rdpdr_main.h rename to channels/rdpdr/client/rdpdr_main.h diff --git a/channels/rdpdr/rdpdr_types.h b/channels/rdpdr/client/rdpdr_types.h similarity index 100% rename from channels/rdpdr/rdpdr_types.h rename to channels/rdpdr/client/rdpdr_types.h diff --git a/channels/rdpdr/serial/CMakeLists.txt b/channels/rdpdr/client/serial/CMakeLists.txt similarity index 100% rename from channels/rdpdr/serial/CMakeLists.txt rename to channels/rdpdr/client/serial/CMakeLists.txt diff --git a/channels/rdpdr/serial/serial_constants.h b/channels/rdpdr/client/serial/serial_constants.h similarity index 100% rename from channels/rdpdr/serial/serial_constants.h rename to channels/rdpdr/client/serial/serial_constants.h diff --git a/channels/rdpdr/serial/serial_main.c b/channels/rdpdr/client/serial/serial_main.c similarity index 100% rename from channels/rdpdr/serial/serial_main.c rename to channels/rdpdr/client/serial/serial_main.c diff --git a/channels/rdpdr/serial/serial_tty.c b/channels/rdpdr/client/serial/serial_tty.c similarity index 100% rename from channels/rdpdr/serial/serial_tty.c rename to channels/rdpdr/client/serial/serial_tty.c diff --git a/channels/rdpdr/serial/serial_tty.h b/channels/rdpdr/client/serial/serial_tty.h similarity index 100% rename from channels/rdpdr/serial/serial_tty.h rename to channels/rdpdr/client/serial/serial_tty.h diff --git a/channels/rdpdr/smartcard/CMakeLists.txt b/channels/rdpdr/client/smartcard/CMakeLists.txt similarity index 100% rename from channels/rdpdr/smartcard/CMakeLists.txt rename to channels/rdpdr/client/smartcard/CMakeLists.txt diff --git a/channels/rdpdr/smartcard/scard_main.c b/channels/rdpdr/client/smartcard/scard_main.c similarity index 100% rename from channels/rdpdr/smartcard/scard_main.c rename to channels/rdpdr/client/smartcard/scard_main.c diff --git a/channels/rdpdr/smartcard/scard_main.h b/channels/rdpdr/client/smartcard/scard_main.h similarity index 100% rename from channels/rdpdr/smartcard/scard_main.h rename to channels/rdpdr/client/smartcard/scard_main.h diff --git a/channels/rdpdr/smartcard/scard_operations.c b/channels/rdpdr/client/smartcard/scard_operations.c similarity index 100% rename from channels/rdpdr/smartcard/scard_operations.c rename to channels/rdpdr/client/smartcard/scard_operations.c diff --git a/channels/rdpsnd/CMakeLists.txt b/channels/rdpsnd/CMakeLists.txt index 745358da0..e6e70054d 100644 --- a/channels/rdpsnd/CMakeLists.txt +++ b/channels/rdpsnd/CMakeLists.txt @@ -1,9 +1,7 @@ # FreeRDP: A Remote Desktop Protocol Client # FreeRDP cmake build script # -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau +# Copyright 2012 Marc-Andre Moreau # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,30 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(RDPSND_SRCS - rdpsnd_main.c - rdpsnd_main.h) - -add_library(rdpsnd ${RDPSND_SRCS}) -set_target_properties(rdpsnd PROPERTIES PREFIX "") - -if(WITH_MONOLITHIC_BUILD) - target_link_libraries(rdpsnd freerdp) -else() - target_link_libraries(rdpsnd freerdp-utils) -endif() - -install(TARGETS rdpsnd DESTINATION ${FREERDP_PLUGIN_PATH}) - -if(WITH_ALSA) - add_subdirectory(alsa) -endif() - -if(WITH_PULSEAUDIO) - add_subdirectory(pulse) -endif() - -if(WITH_MACAUDIO) - add_subdirectory(mac_audio) -endif() +add_subdirectory(client) diff --git a/channels/rdpsnd/client/CMakeLists.txt b/channels/rdpsnd/client/CMakeLists.txt new file mode 100644 index 000000000..745358da0 --- /dev/null +++ b/channels/rdpsnd/client/CMakeLists.txt @@ -0,0 +1,46 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# 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. + +set(RDPSND_SRCS + rdpsnd_main.c + rdpsnd_main.h) + +add_library(rdpsnd ${RDPSND_SRCS}) +set_target_properties(rdpsnd PROPERTIES PREFIX "") + +if(WITH_MONOLITHIC_BUILD) + target_link_libraries(rdpsnd freerdp) +else() + target_link_libraries(rdpsnd freerdp-utils) +endif() + +install(TARGETS rdpsnd DESTINATION ${FREERDP_PLUGIN_PATH}) + +if(WITH_ALSA) + add_subdirectory(alsa) +endif() + +if(WITH_PULSEAUDIO) + add_subdirectory(pulse) +endif() + +if(WITH_MACAUDIO) + add_subdirectory(mac_audio) +endif() + diff --git a/channels/rdpsnd/alsa/CMakeLists.txt b/channels/rdpsnd/client/alsa/CMakeLists.txt similarity index 100% rename from channels/rdpsnd/alsa/CMakeLists.txt rename to channels/rdpsnd/client/alsa/CMakeLists.txt diff --git a/channels/rdpsnd/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c similarity index 100% rename from channels/rdpsnd/alsa/rdpsnd_alsa.c rename to channels/rdpsnd/client/alsa/rdpsnd_alsa.c diff --git a/channels/rdpsnd/mac_audio/CMakeLists.txt b/channels/rdpsnd/client/mac_audio/CMakeLists.txt similarity index 100% rename from channels/rdpsnd/mac_audio/CMakeLists.txt rename to channels/rdpsnd/client/mac_audio/CMakeLists.txt diff --git a/channels/rdpsnd/mac_audio/rdpsnd_audio_q.c b/channels/rdpsnd/client/mac_audio/rdpsnd_audio_q.c similarity index 100% rename from channels/rdpsnd/mac_audio/rdpsnd_audio_q.c rename to channels/rdpsnd/client/mac_audio/rdpsnd_audio_q.c diff --git a/channels/rdpsnd/pulse/CMakeLists.txt b/channels/rdpsnd/client/pulse/CMakeLists.txt similarity index 100% rename from channels/rdpsnd/pulse/CMakeLists.txt rename to channels/rdpsnd/client/pulse/CMakeLists.txt diff --git a/channels/rdpsnd/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c similarity index 100% rename from channels/rdpsnd/pulse/rdpsnd_pulse.c rename to channels/rdpsnd/client/pulse/rdpsnd_pulse.c diff --git a/channels/rdpsnd/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c similarity index 100% rename from channels/rdpsnd/rdpsnd_main.c rename to channels/rdpsnd/client/rdpsnd_main.c diff --git a/channels/rdpsnd/rdpsnd_main.h b/channels/rdpsnd/client/rdpsnd_main.h similarity index 100% rename from channels/rdpsnd/rdpsnd_main.h rename to channels/rdpsnd/client/rdpsnd_main.h diff --git a/channels/skel/CMakeLists.txt b/channels/skel/CMakeLists.txt index 1c2943c8f..e6e70054d 100644 --- a/channels/skel/CMakeLists.txt +++ b/channels/skel/CMakeLists.txt @@ -1,9 +1,7 @@ # FreeRDP: A Remote Desktop Protocol Client # FreeRDP cmake build script # -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau +# Copyright 2012 Marc-Andre Moreau # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,17 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(SKEL_SRCS - skel_main.c - skel_main.h) +add_subdirectory(client) -add_library(skel ${SKEL_SRCS}) -set_target_properties(skel PROPERTIES PREFIX "") - -if(WITH_MONOLITHIC_BUILD) - target_link_libraries(skel freerdp) -else() - target_link_libraries(skel freerdp-utils) -endif() - -install(TARGETS skel DESTINATION ${FREERDP_PLUGIN_PATH}) diff --git a/channels/skel/client/CMakeLists.txt b/channels/skel/client/CMakeLists.txt new file mode 100644 index 000000000..1c2943c8f --- /dev/null +++ b/channels/skel/client/CMakeLists.txt @@ -0,0 +1,33 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# 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. + +set(SKEL_SRCS + skel_main.c + skel_main.h) + +add_library(skel ${SKEL_SRCS}) +set_target_properties(skel PROPERTIES PREFIX "") + +if(WITH_MONOLITHIC_BUILD) + target_link_libraries(skel freerdp) +else() + target_link_libraries(skel freerdp-utils) +endif() + +install(TARGETS skel DESTINATION ${FREERDP_PLUGIN_PATH}) diff --git a/channels/skel/readme.txt b/channels/skel/client/readme.txt similarity index 100% rename from channels/skel/readme.txt rename to channels/skel/client/readme.txt diff --git a/channels/skel/server_chan_test.cpp b/channels/skel/client/server_chan_test.cpp similarity index 100% rename from channels/skel/server_chan_test.cpp rename to channels/skel/client/server_chan_test.cpp diff --git a/channels/skel/skel_main.c b/channels/skel/client/skel_main.c similarity index 100% rename from channels/skel/skel_main.c rename to channels/skel/client/skel_main.c diff --git a/channels/skel/skel_main.h b/channels/skel/client/skel_main.h similarity index 100% rename from channels/skel/skel_main.h rename to channels/skel/client/skel_main.h