The previous fix for eliminating the console window in vncviewer.exe was not portable...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4576 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cda85ca19f4b1149662f0faae4d620423e435c96..159de7200cf9cbedb8b61f4b3a9981554ef1c37d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,9 +309,6 @@ add_subdirectory(common)
 
 if(WIN32)
   add_subdirectory(win)
- if(CMAKE_C_COMPILER_ID STREQUAL GNU)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows")
- endif(CMAKE_C_COMPILER_ID STREQUAL GNU)
 else()
   # No interest in building x related parts on Apple
   if(NOT APPLE)

diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index ec8996338d6caeec0fc879e57472ea18ddd018fd..8be757ee2f71f95218ecb5fb4db5ef6431ce972e 100644 (file)
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -29,7 +29,11 @@ else()
   set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} X11PixelBuffer.cxx)
 endif()
 
-add_executable(vncviewer ${VNCVIEWER_SOURCES})
+if(WIN32)
+  add_executable(vncviewer WIN32 ${VNCVIEWER_SOURCES})
+else()
+  add_executable(vncviewer ${VNCVIEWER_SOURCES})
+endif()
 
 target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})