diff --git a/hm.py b/hm.py index d67948ed..37c70171 100644 --- a/hm.py +++ b/hm.py @@ -58,7 +58,7 @@ globalOptionsLong = ['no-prompts', 'generator=', 'verbose', 'make-gui'] cmd_opt_dict = { 'about' : ['', []], 'setup' : ['g:', []], - 'configure' : ['g:dr', ['debug', 'release', 'game-device', 'vnc', 'mac-sdk=']], + 'configure' : ['g:dr', ['debug', 'release', 'game-device', 'mac-sdk=']], 'build' : ['dr', ['debug', 'release']], 'clean' : ['dr', ['debug', 'release']], 'update' : ['', []], diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt index e706ea5e..897f7bd3 100644 --- a/src/cmd/synergys/CMakeLists.txt +++ b/src/cmd/synergys/CMakeLists.txt @@ -55,10 +55,6 @@ if (UNIX) ) endif() -if (VNC_SUPPORT) - list(APPEND libs vnc_server vnc_client) -endif() - include_directories(${inc}) add_executable(synergys ${src}) target_link_libraries(synergys diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt index b775f70a..11a3f98b 100644 --- a/src/lib/synergy/CMakeLists.txt +++ b/src/lib/synergy/CMakeLists.txt @@ -49,7 +49,6 @@ set(inc CArgsBase.h IAppUtil.h CEventGameDevice.h - CVncClient.h ) set(src @@ -79,7 +78,6 @@ set(src CAppUtil.cpp CArgsBase.cpp CEventGameDevice.cpp - CVncClient.cpp CGameDevice.cpp ) @@ -119,10 +117,6 @@ if (UNIX) list(APPEND inc ../../.. ) -elseif (WIN32) - list(APPEND inc - ../../vnc/win - ) endif() include_directories(${inc}) diff --git a/tools/build/toolchain.py b/tools/build/toolchain.py index 852d81ef..13e99510 100644 --- a/tools/build/toolchain.py +++ b/tools/build/toolchain.py @@ -66,9 +66,6 @@ class InternalCommands: # by default, do not compile with game device support. gameDevice = False - # by default, do not compile with vnc support. - vncSupport = False - # by default, let cmake decide macSdk = None @@ -192,11 +189,6 @@ class InternalCommands: else: cmake_args += " -DGAME_DEVICE_SUPPORT:BOOL=FALSE" - if self.vncSupport: - cmake_args += " -DVNC_SUPPORT:BOOL=TRUE" - else: - cmake_args += " -DVNC_SUPPORT:BOOL=FALSE" - if self.macSdk: path = "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk/" cmake_args += " -DCMAKE_OSX_SYSROOT=" + path @@ -1238,8 +1230,6 @@ class CommandHandler: self.qtDir = a elif o == '--game-device': self.ic.gameDevice = True - elif o == '--vnc': - self.ic.vncSupport = True elif o == '--mac-sdk': self.ic.macSdk = a