From cfbb6c286c021711117115fdca7a3613b505c668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Thu, 30 Jun 2011 22:20:39 -0400 Subject: [PATCH] libfreerdp-core: added cmake script --- CMakeLists.txt | 1 + libfreerdp-core/CMakeLists.txt | 20 ++++++++++++++++++++ libfreerdp-core/credssp.c | 8 -------- libfreerdp-core/nego.c | 3 --- libfreerdp-core/nego.h | 1 - libfreerdp-core/ntlmssp.h | 1 - 6 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 libfreerdp-core/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 046baccf0..ecc3f0d4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,3 +28,4 @@ add_subdirectory(libfreerdp-utils) add_subdirectory(libfreerdp-kbd) add_subdirectory(libfreerdp-gdi) +#add_subdirectory(libfreerdp-core) diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt new file mode 100644 index 000000000..0f07ab2a8 --- /dev/null +++ b/libfreerdp-core/CMakeLists.txt @@ -0,0 +1,20 @@ +# libfreerdp-core + +include_directories(.) +include_directories(../include) + +add_definitions(-DL_ENDIAN=1) +add_definitions(-DEXT_PATH="/usr/lib/freerdp/extensions") + +set(LIBFREERDP_CORE_SRCS + nego.c + nego.h + credssp.c + credssp.h + ntlmssp.c + ntlmssp.h +) + +add_library(freerdp-core SHARED ${LIBFREERDP_CORE_SRCS}) + +install(TARGETS freerdp-core DESTINATION lib) diff --git a/libfreerdp-core/credssp.c b/libfreerdp-core/credssp.c index 8cb5c4004..fcc043ff2 100644 --- a/libfreerdp-core/credssp.c +++ b/libfreerdp-core/credssp.c @@ -17,15 +17,7 @@ * limitations under the License. */ -#include "frdp.h" -#include "rdp.h" -#include "tls.h" -#include "asn1.h" -#include "security.h" #include "stream.h" -#include "tcp.h" -#include "mcs.h" -#include "iso.h" #ifndef _WIN32 #include #endif diff --git a/libfreerdp-core/nego.c b/libfreerdp-core/nego.c index 454750466..77b7401c8 100644 --- a/libfreerdp-core/nego.c +++ b/libfreerdp-core/nego.c @@ -17,9 +17,6 @@ * limitations under the License. */ -#include "frdp.h" -#include "rdp.h" -#include "tcp.h" #include "stream.h" #include diff --git a/libfreerdp-core/nego.h b/libfreerdp-core/nego.h index da1dd9a62..64367c8c8 100644 --- a/libfreerdp-core/nego.h +++ b/libfreerdp-core/nego.h @@ -20,7 +20,6 @@ #ifndef __NEGO_H #define __NEGO_H -#include "frdp.h" #include "stream.h" #include "network.h" diff --git a/libfreerdp-core/ntlmssp.h b/libfreerdp-core/ntlmssp.h index a8fd55ccb..febb67f6a 100644 --- a/libfreerdp-core/ntlmssp.h +++ b/libfreerdp-core/ntlmssp.h @@ -20,7 +20,6 @@ #ifndef __NTLMSSP_H #define __NTLMSSP_H -#include "security.h" #include "credssp.h" #include