From ca89be3c91de9c406124e00e952f4e1b56698200 Mon Sep 17 00:00:00 2001 From: Corey C Date: Fri, 16 Nov 2012 22:54:31 -0500 Subject: [PATCH] wfreerdp-server: small packaging patch --- CMakeLists.txt | 17 ++++++++++++++++- server/Windows/wf_peer.c | 10 +++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 931e60428..b8c98b586 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -413,10 +413,25 @@ if(MSVC) install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries) + + + set(EXTRA_DATA_DIR "pre-requisites/") + file(GLOB EXTRA_FILES "${CMAKE_SOURCE_DIR}/extra/*") + install(FILES ${EXTRA_FILES} + DESTINATION ${EXTRA_DATA_DIR} + COMPONENT extra) + + set(REV_DATA_DIR "REV/") + file(GLOB REV_FILES "${CMAKE_SOURCE_DIR}/REV/*") + install(FILES ${REV_FILES} + DESTINATION ${REV_DATA_DIR} + COMPONENT rev) endif() endif() -set(CPACK_COMPONENTS_ALL client server libraries headers) + +set(CPACK_COMPONENTS_ALL client server libraries headers extra rev) + set(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client") set(CPACK_COMPONENT_CLIENT_GROUP "Applications") diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index dbce24e30..aed5e9d02 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -91,14 +91,14 @@ BOOL wf_peer_post_connect(freerdp_peer* client) return FALSE; } - if ((settings->width != wfi->servscreen_width) || (settings->height != wfi->servscreen_height)) + if ((settings->DesktopWidth != wfi->servscreen_width) || (settings->DesktopHeight != wfi->servscreen_height)) { printf("Client requested resolution %dx%d, but will resize to %dx%d\n", - settings->width, settings->height, wfi->servscreen_width, wfi->servscreen_height); + settings->DesktopWidth, settings->DesktopHeight, wfi->servscreen_width, wfi->servscreen_height); - settings->width = wfi->servscreen_width; - settings->height = wfi->servscreen_height; - settings->color_depth = wfi->bitsPerPixel; + settings->DesktopWidth = wfi->servscreen_width; + settings->DesktopHeight = wfi->servscreen_height; + settings->ColorDepth = wfi->bitsPerPixel; client->update->DesktopResize(client->update->context); }