From 1a2e71067a7e2afbfadee73c333005199c125c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Wed, 19 Sep 2012 17:51:06 -0400
Subject: [PATCH] wfreerdp-server: fix monolithic build

---
 cmake/ConfigOptions.cmake     |  2 +-
 server/Windows/CMakeLists.txt | 42 ++++++++++-------------------------
 2 files changed, 13 insertions(+), 31 deletions(-)

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