From 39d6fd3bd05a4dbbc40522fd58a2adff0e737fcb Mon Sep 17 00:00:00 2001 From: C-o-r-E Date: Wed, 19 Sep 2012 12:43:24 -0400 Subject: [PATCH] wfreerdp-server: added cmake config WITH_WIN8 --- cmake/ConfigOptions.cmake | 1 + config.h.in | 1 + server/Windows/CMakeLists.txt | 35 +++++++++++++++++++++++------------ server/Windows/wf_interface.h | 2 -- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake index 70e861c86..322e3ca2d 100644 --- a/cmake/ConfigOptions.cmake +++ b/cmake/ConfigOptions.cmake @@ -13,6 +13,7 @@ endif() if(MSVC) option(WITH_NATIVE_SSPI "Use native SSPI modules" ON) option(WITH_MSVC_STATIC "Use static MSVC runtime" OFF) + option(WITH_WIN8 "Required for wfreedrp-server on windows 8" OFF) endif() if(${CMAKE_VERSION} VERSION_GREATER 2.8.8) diff --git a/config.h.in b/config.h.in index 8b6f2db61..524822f70 100644 --- a/config.h.in +++ b/config.h.in @@ -31,6 +31,7 @@ #cmakedefine WITH_NEON #cmakedefine WITH_NATIVE_SSPI #cmakedefine WITH_JPEG +#cmakedefine WITH_WIN8 /* Debug */ #cmakedefine WITH_DEBUG_CERTIFICATE diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt index d849b5c22..00e74dc93 100644 --- a/server/Windows/CMakeLists.txt +++ b/server/Windows/CMakeLists.txt @@ -49,21 +49,32 @@ if(WITH_MONOLITHIC_BUILD) set(WFREERDP_SERVER_LIBS freerdp) else() - set(WFREERDP_SERVER_LIBS - freerdp-core + if(WITH_WIN8) + + set(WFREERDP_SERVER_LIBS + freerdp-core - freerdp-utils + freerdp-utils - freerdp-codec + freerdp-codec - freerdp-channels - - d3d11.lib - - dxgi.lib - - dxguid.lib) - + freerdp-channels + + d3d11.lib + + dxgi.lib + + dxguid.lib) + else() + set(WFREERDP_SERVER_LIBS + freerdp-core + + freerdp-utils + + freerdp-codec + + freerdp-channels) + endif() endif() target_link_libraries(wfreerdp-server ${WFREERDP_SERVER_LIBS}) diff --git a/server/Windows/wf_interface.h b/server/Windows/wf_interface.h index 24070fd86..587d8305c 100644 --- a/server/Windows/wf_interface.h +++ b/server/Windows/wf_interface.h @@ -20,8 +20,6 @@ #ifndef WF_INTERFACE_H #define WF_INTERFACE_H -#define WITH_WIN8 - #include #include