From 0401f7c17e2de229e2c76f68f469fcec3208a2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sun, 2 Oct 2011 20:52:17 -0400 Subject: [PATCH] libfreerdp-codec: merge with libfreerdp-nsc --- CMakeLists.txt | 1 - client/X11/xf_gdi.c | 4 +-- client/X11/xfreerdp.c | 2 +- cunit/CMakeLists.txt | 4 +-- cunit/test_gcc.c | 2 +- cunit/test_librfx.c | 2 +- cunit/test_utils.c | 2 +- include/freerdp/{nsc => codec}/nsc.h | 0 libfreerdp-codec/CMakeLists.txt | 1 + .../libnsc.c => libfreerdp-codec/nsc.c | 13 +++++---- libfreerdp-codec/rfx_sse2.h | 2 +- libfreerdp-core/CMakeLists.txt | 2 +- libfreerdp-gdi/CMakeLists.txt | 3 +- libfreerdp-gdi/gdi.c | 4 +-- libfreerdp-nsc/CMakeLists.txt | 29 ------------------- server/X11/CMakeLists.txt | 3 +- server/X11/xf_peer.h | 2 +- server/test/CMakeLists.txt | 2 +- server/test/tfreerdp.c | 2 +- 19 files changed, 25 insertions(+), 55 deletions(-) rename include/freerdp/{nsc => codec}/nsc.h (100%) rename libfreerdp-nsc/libnsc.c => libfreerdp-codec/nsc.c (98%) delete mode 100644 libfreerdp-nsc/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a0b05fb8..659b4b679 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,6 @@ add_subdirectory(libfreerdp-cache) add_subdirectory(libfreerdp-codec) add_subdirectory(libfreerdp-chanman) add_subdirectory(libfreerdp-core) -add_subdirectory(libfreerdp-nsc) if(NOT WIN32) add_subdirectory(channels) diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c index d75b6c921..9396d317a 100644 --- a/client/X11/xf_gdi.c +++ b/client/X11/xf_gdi.c @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c index 3a30cdd1a..c1dbc62a5 100644 --- a/client/X11/xfreerdp.c +++ b/client/X11/xfreerdp.c @@ -39,8 +39,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/cunit/CMakeLists.txt b/cunit/CMakeLists.txt index db1f41f43..65dd48680 100644 --- a/cunit/CMakeLists.txt +++ b/cunit/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(${CMAKE_SOURCE_DIR}) # for some internal tests include_directories(../libfreerdp-core) include_directories(../libfreerdp-gdi) include_directories(../libfreerdp-cache) -include_directories(../libfreerdp-rfx) +include_directories(../libfreerdp-codec) add_executable(test_freerdp test_per.c @@ -72,6 +72,6 @@ target_link_libraries(test_freerdp freerdp-core) target_link_libraries(test_freerdp freerdp-gdi) target_link_libraries(test_freerdp freerdp-utils) target_link_libraries(test_freerdp freerdp-chanman) -target_link_libraries(test_freerdp freerdp-rfx) +target_link_libraries(test_freerdp freerdp-codec) add_test(CUnitTests ${EXECUTABLE_OUTPUT_PATH}/test_freerdp) diff --git a/cunit/test_gcc.c b/cunit/test_gcc.c index ac6bbda59..c340dab33 100644 --- a/cunit/test_gcc.c +++ b/cunit/test_gcc.c @@ -195,7 +195,7 @@ void test_gcc_write_client_network_data(void) rdpSettings* settings; s = stream_new(44); - settings = settings_new(); + settings = settings_new(NULL); settings->num_channels = 3; memset(settings->channels, 0, sizeof(rdpChan) * settings->num_channels); diff --git a/cunit/test_librfx.c b/cunit/test_librfx.c index bc1df676d..8799959ff 100644 --- a/cunit/test_librfx.c +++ b/cunit/test_librfx.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "rfx_types.h" #include "rfx_bitstream.h" #include "rfx_rlgr.h" diff --git a/cunit/test_utils.c b/cunit/test_utils.c index cbae793a1..31fbdf2b1 100644 --- a/cunit/test_utils.c +++ b/cunit/test_utils.c @@ -150,7 +150,7 @@ void test_args(void) i = 0; while (argc > 0) { - settings = settings_new(); + settings = settings_new(NULL); i++; c = freerdp_parse_args(settings, argc, argv, process_plugin_args, NULL, process_ui_args, NULL); diff --git a/include/freerdp/nsc/nsc.h b/include/freerdp/codec/nsc.h similarity index 100% rename from include/freerdp/nsc/nsc.h rename to include/freerdp/codec/nsc.h diff --git a/libfreerdp-codec/CMakeLists.txt b/libfreerdp-codec/CMakeLists.txt index e87c243ae..27519d2a2 100644 --- a/libfreerdp-codec/CMakeLists.txt +++ b/libfreerdp-codec/CMakeLists.txt @@ -38,6 +38,7 @@ set(FREERDP_CODEC_SRCS rfx_rlgr.h rfx_types.h rfx.c + nsc.c ) if(WITH_SSE2) diff --git a/libfreerdp-nsc/libnsc.c b/libfreerdp-codec/nsc.c similarity index 98% rename from libfreerdp-nsc/libnsc.c rename to libfreerdp-codec/nsc.c index e296cec78..02f8da83f 100644 --- a/libfreerdp-nsc/libnsc.c +++ b/libfreerdp-codec/nsc.c @@ -16,12 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include /* we store the 9 th bits at the end of stream as bitstream */ void nsc_cl_expand(STREAM* stream, uint8 shiftcount, uint32 origsz) diff --git a/libfreerdp-codec/rfx_sse2.h b/libfreerdp-codec/rfx_sse2.h index ca3d6a109..b9a9a2a56 100644 --- a/libfreerdp-codec/rfx_sse2.h +++ b/libfreerdp-codec/rfx_sse2.h @@ -20,7 +20,7 @@ #ifndef __RFX_SSE2_H #define __RFX_SSE2_H -#include +#include void rfx_init_sse2(RFX_CONTEXT* context); diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt index ea0fcb045..c19ef1d44 100644 --- a/libfreerdp-core/CMakeLists.txt +++ b/libfreerdp-core/CMakeLists.txt @@ -103,6 +103,6 @@ endif() target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES}) target_link_libraries(freerdp-core freerdp-utils) -target_link_libraries(freerdp-core freerdp-common) +target_link_libraries(freerdp-core freerdp-codec) install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-gdi/CMakeLists.txt b/libfreerdp-gdi/CMakeLists.txt index d9bb325f6..e8699ddc1 100644 --- a/libfreerdp-gdi/CMakeLists.txt +++ b/libfreerdp-gdi/CMakeLists.txt @@ -36,8 +36,7 @@ set(FREERDP_GDI_SRCS add_library(freerdp-gdi ${FREERDP_GDI_SRCS}) target_link_libraries(freerdp-gdi freerdp-cache) -target_link_libraries(freerdp-gdi freerdp-common) -target_link_libraries(freerdp-gdi freerdp-rfx freerdp-nsc) +target_link_libraries(freerdp-gdi freerdp-codec) set_target_properties(freerdp-gdi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") diff --git a/libfreerdp-gdi/gdi.c b/libfreerdp-gdi/gdi.c index 5e900ede6..0cf48df3e 100644 --- a/libfreerdp-gdi/gdi.c +++ b/libfreerdp-gdi/gdi.c @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/libfreerdp-nsc/CMakeLists.txt b/libfreerdp-nsc/CMakeLists.txt deleted file mode 100644 index 2b62105c1..000000000 --- a/libfreerdp-nsc/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# FreeRDP: A Remote Desktop Protocol Client -# libfreerdp-nsc cmake build script -# -# CopyRight SamSung -# Author Jiten Pathy -# -# 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(LIBFREERDP_NSC_SRCS - libnsc.c -) - -add_library(freerdp-nsc ${LIBFREERDP_NSC_SRCS}) - -set_target_properties(freerdp-nsc PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") - -target_link_libraries(freerdp-nsc freerdp-utils) - -install(TARGETS freerdp-nsc DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/server/X11/CMakeLists.txt b/server/X11/CMakeLists.txt index dbf1d2b15..e0aa48f7a 100644 --- a/server/X11/CMakeLists.txt +++ b/server/X11/CMakeLists.txt @@ -32,7 +32,6 @@ if(XEXT_FOUND) endif() target_link_libraries(xfreerdp-server freerdp-core) -target_link_libraries(xfreerdp-server freerdp-common) +target_link_libraries(xfreerdp-server freerdp-codec) target_link_libraries(xfreerdp-server freerdp-utils) -target_link_libraries(xfreerdp-server freerdp-rfx) target_link_libraries(xfreerdp-server ${X11_LIBRARIES}) diff --git a/server/X11/xf_peer.h b/server/X11/xf_peer.h index 7137b6705..12f884fdd 100644 --- a/server/X11/xf_peer.h +++ b/server/X11/xf_peer.h @@ -20,7 +20,7 @@ #ifndef __XF_PEER_H #define __XF_PEER_H -#include +#include #include #include diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt index db5f2fdd7..842b8617c 100644 --- a/server/test/CMakeLists.txt +++ b/server/test/CMakeLists.txt @@ -22,4 +22,4 @@ add_executable(tfreerdp-server target_link_libraries(tfreerdp-server freerdp-core) target_link_libraries(tfreerdp-server freerdp-utils) -target_link_libraries(tfreerdp-server freerdp-rfx) +target_link_libraries(tfreerdp-server freerdp-codec) diff --git a/server/test/tfreerdp.c b/server/test/tfreerdp.c index b8dd41400..203c1ac86 100644 --- a/server/test/tfreerdp.c +++ b/server/test/tfreerdp.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include static char* test_pcap_file = NULL;