summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2011-11-08 06:57:58 +0000
committerDRC <dcommander@users.sourceforge.net>2011-11-08 06:57:58 +0000
commitccc0969dd97ed55b063f79fc2b85011e48b765ca (patch)
tree908b4b88b2d3253bb207925944e9e5cba99d7a16 /win
parentc6c436e9faaca220a0b58027badf08a0907e3589 (diff)
downloadtigervnc-ccc0969dd97ed55b063f79fc2b85011e48b765ca.tar.gz
tigervnc-ccc0969dd97ed55b063f79fc2b85011e48b765ca.zip
Remove Visual C++ support
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4774 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
-rw-r--r--win/vncconfig/CMakeLists.txt5
-rw-r--r--win/winvnc/CMakeLists.txt9
2 files changed, 1 insertions, 13 deletions
diff --git a/win/vncconfig/CMakeLists.txt b/win/vncconfig/CMakeLists.txt
index 9883dbd8..2cee4ee4 100644
--- a/win/vncconfig/CMakeLists.txt
+++ b/win/vncconfig/CMakeLists.txt
@@ -1,10 +1,5 @@
include_directories(${CMAKE_BINARY_DIR}/win)
-# Disable auto-generated manifests, since we have our own
-if(MSVC)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-endif()
-
add_executable(vncconfig WIN32
Legacy.cxx
PasswordDialog.cxx
diff --git a/win/winvnc/CMakeLists.txt b/win/winvnc/CMakeLists.txt
index dd9117b5..72a007b4 100644
--- a/win/winvnc/CMakeLists.txt
+++ b/win/winvnc/CMakeLists.txt
@@ -1,19 +1,12 @@
include_directories(${CMAKE_BINARY_DIR}/win ${CMAKE_CURRENT_SOURCE_DIR})
-# Disable auto-generated manifests, since we have our own
-if(MSVC)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-endif()
-
add_library(wm_hooks SHARED
../wm_hooks/wm_hooks.cxx
../wm_hooks/wm_hooks.def
../wm_hooks/wm_hooks.rc)
# We want the DLL to be named wm_hooks.dll rather than libwm_hooks.dll
-if(MINGW)
- set_target_properties(wm_hooks PROPERTIES PREFIX "")
-endif()
+set_target_properties(wm_hooks PROPERTIES PREFIX "")
set(VNCVIEWER_JAR_PATH ${CMAKE_BINARY_DIR}/java/VncViewer.jar)
set(INDEX_VNC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/index.vnc)