morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

wfreerdp-server: fix monolithic build

Browse Source
This commit is contained in:
Marc-André Moreau
2012-09-19 17:51:06 -04:00
parent 25f05d38e8
commit 1a2e71067a
2 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ConfigOptions.cmake
View File

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

42
server/Windows/CMakeLists.txt
View File

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