wfreerdp-server: fix monolithic build

diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
index 322e3ca..f99d7dc 100644 (file)
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@@ -13,7 +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)
+       option(WITH_WIN8 "Use Windows 8 libraries" OFF)
 endif()
 
 if(${CMAKE_VERSION} VERSION_GREATER 2.8.8)

diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
index 00e74dc..59570b4 100644 (file)
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client\r
 # FreeRDP Windows Server cmake build script\r
 #\r
-# Copyright 2011 O.S. Systems Software Ltda.\r
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>\r
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>\r
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>\r
 #\r
 # Licensed under the Apache License, Version 2.0 (the "License");\r
 # you may not use this file except in compliance with the License.\r
@@ -35,6 +33,7 @@ set(WFREERDP_SERVER_SRCS
        wf_settings.c\r
        wf_settings.h\r
        wf_info.c
+\r
        wf_info.h)\r
 \r
 if(WITH_SERVER_INTERFACE)\r
@@ -45,36 +44,19 @@ else()
        add_executable(wfreerdp-server ${WFREERDP_SERVER_SRCS})\r
 endif()\r
 \r
+if(WITH_WIN8)          \r
+       set(WFREERDP_SERVER_LIBS d3d11 dxgi dxguid)\r
+endif()\r
+\r
 if(WITH_MONOLITHIC_BUILD)\r
-       set(WFREERDP_SERVER_LIBS freerdp)\r
+       set(WFREERDP_SERVER_LIBS ${WFREERDP_SERVER_LIBS} freerdp)\r
 else()
 \r
-       if(WITH_WIN8)   \r
-       \r
-               set(WFREERDP_SERVER_LIBS\r
-                       freerdp-core\r
-\r
-                       freerdp-utils\r
-\r
-                       freerdp-codec\r
-\r
-                       freerdp-channels\r
-                       \r
-                       d3d11.lib\r
-                       \r
-                       dxgi.lib\r
-                       \r
-                       dxguid.lib)\r
-       else()\r
-               set(WFREERDP_SERVER_LIBS\r
-                       freerdp-core
-\r
-                       freerdp-utils
-\r
-                       freerdp-codec
-\r
-                       freerdp-channels)\r
-       endif()
+       set(WFREERDP_SERVER_LIBS ${WFREERDP_SERVER_LIBS}\r
+               freerdp-core\r
+               freerdp-utils\r
+               freerdp-codec\r
+               freerdp-channels)\r
 endif()\r
 \r
 target_link_libraries(wfreerdp-server ${WFREERDP_SERVER_LIBS})\r