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

libfreerdp-codec: merge with libfreerdp-nsc

Browse Source
This commit is contained in:
Marc-André Moreau 2011-10-02 20:52:17 -04:00
parent 3f8ad5e8f9
commit 0401f7c17e
19 changed files with 25 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

4
client/X11/xf_gdi.c
View File

@ -18,8 +18,8 @@
*/
#include <freerdp/gdi/gdi.h>
#include <freerdp/rfx/rfx.h>
#include <freerdp/nsc/nsc.h>
#include <freerdp/codec/rfx.h>
#include <freerdp/codec/nsc.h>
#include <freerdp/constants.h>
#include <freerdp/utils/memory.h>
#include <freerdp/codec/color.h>

2
client/X11/xfreerdp.c
View File

@ -39,8 +39,8 @@
#include <sys/wait.h>
#include <sys/types.h>
#include <sys/select.h>
#include <freerdp/rfx/rfx.h>
#include <freerdp/constants.h>
#include <freerdp/codec/rfx.h>
#include <freerdp/codec/color.h>
#include <freerdp/utils/args.h>
#include <freerdp/utils/memory.h>

4
cunit/CMakeLists.txt
View File

@ -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)

2
cunit/test_gcc.c
View File

@ -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);

2
cunit/test_librfx.c
View File

@ -29,7 +29,7 @@
#include <freerdp/utils/print.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/rfx/rfx.h>
#include <freerdp/codec/rfx.h>
#include "rfx_types.h"
#include "rfx_bitstream.h"
#include "rfx_rlgr.h"

2
cunit/test_utils.c
View File

@ -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);

0
include/freerdp/nsc/nsc.h → include/freerdp/codec/nsc.h
View File

1
libfreerdp-codec/CMakeLists.txt
View File

@ -38,6 +38,7 @@ set(FREERDP_CODEC_SRCS
rfx_rlgr.h
rfx_types.h
rfx.c
nsc.c
)
if(WITH_SSE2)

13
libfreerdp-nsc/libnsc.c → libfreerdp-codec/nsc.c
View File

@ -16,12 +16,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include<stdio.h>
#include<stdlib.h>
#include<string.h>
#include<stdint.h>
#include<freerdp/nsc/nsc.h>
#include<freerdp/utils/memory.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <freerdp/codec/nsc.h>
#include <freerdp/utils/memory.h>
/* we store the 9 th bits at the end of stream as bitstream */
void nsc_cl_expand(STREAM* stream, uint8 shiftcount, uint32 origsz)

2
libfreerdp-codec/rfx_sse2.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_SSE2_H
#define __RFX_SSE2_H
#include <freerdp/rfx/rfx.h>
#include <freerdp/codec/rfx.h>
void rfx_init_sse2(RFX_CONTEXT* context);

2
libfreerdp-core/CMakeLists.txt
View File

@ -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})

3
libfreerdp-gdi/CMakeLists.txt
View File

@ -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")

4
libfreerdp-gdi/gdi.c
View File

@ -25,8 +25,8 @@
#include <freerdp/constants.h>
#include <freerdp/utils/bitmap.h>
#include <freerdp/codec/color.h>
#include <freerdp/rfx/rfx.h>
#include <freerdp/nsc/nsc.h>
#include <freerdp/codec/rfx.h>
#include <freerdp/codec/nsc.h>
#include <freerdp/gdi/dc.h>
#include <freerdp/gdi/pen.h>

29
libfreerdp-nsc/CMakeLists.txt
View File

@ -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})

3
server/X11/CMakeLists.txt
View File

@ -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})

2
server/X11/xf_peer.h
View File

@ -20,7 +20,7 @@
#ifndef __XF_PEER_H
#define __XF_PEER_H
#include <freerdp/rfx/rfx.h>
#include <freerdp/codec/rfx.h>
#include <freerdp/listener.h>
#include <freerdp/utils/stream.h>

2
server/test/CMakeLists.txt
View File

@ -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)

2
server/test/tfreerdp.c
View File

@ -29,7 +29,7 @@
#include <freerdp/utils/sleep.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/thread.h>
#include <freerdp/rfx/rfx.h>
#include <freerdp/codec/rfx.h>
#include <freerdp/listener.h>
static char* test_pcap_file = NULL;