wfreerdp-server: manual merge

diff --cc server/Windows/CMakeLists.txt
index 26cb232,b0d680d..5f922b5
--- 1/server/Windows/CMakeLists.txt
--- 2/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@@ -37,33 -40,35 +40,35 @@@ set(${MODULE_PREFIX}_SRC
        wf_info.h)\r
  \r
  if(WITH_SERVER_INTERFACE)\r
-       add_library(wfreerdp-server ${WFREERDP_SERVER_SRCS})\r
-       set_target_properties(wfreerdp-server PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")\r
+       add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})\r
+       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")\r
  else()\r
-       set(WFREERDP_SERVER_SRCS ${WFREERDP_SERVER_SRCS} cli/wfreerdp.c cli/wfreerdp.h)\r
-       add_executable(wfreerdp-server ${WFREERDP_SERVER_SRCS})\r
+       set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h)\r
+       add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})\r
  endif()\r
 -\r
 +
  if(WITH_WIN8)         \r
-       set(WFREERDP_SERVER_LIBS d3d11 dxgi dxguid)\r
+       set(${MODULE_PREFIX}_LIBS d3d11 dxgi dxguid)\r
  endif()\r
  \r
--if(WITH_MONOLITHIC_BUILD)\r
-       set(WFREERDP_SERVER_LIBS ${WFREERDP_SERVER_LIBS} freerdp)
- else()\r
-       set(WFREERDP_SERVER_LIBS ${WFREERDP_SERVER_LIBS}\r
++if(WITH_MONOLITHIC_BUILD)
+       set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)\r
+ else()
+ \r
 -      set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}\r
++      set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
                freerdp-core\r
                freerdp-utils\r
                freerdp-codec\r
 -              freerdp-channels)\r
 +              freerdp-channels)
  endif()\r
--\r
- target_link_libraries(wfreerdp-server ${WFREERDP_SERVER_LIBS})\r
++
+ target_link_libraries(wfreerdp-server ${${MODULE_PREFIX}_LIBS})\r
+ 
  \r
  if(WITH_SERVER_INTERFACE)\r
-       install(TARGETS wfreerdp-server DESTINATION ${CMAKE_INSTALL_LIBDIR})\r
+       install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})\r
  else()\r
-       install(TARGETS wfreerdp-server DESTINATION ${CMAKE_INSTALL_BINDIR})\r
+       install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})\r
  endif()\r
  \r
  if(WITH_SERVER_INTERFACE)\r