stripped out remaining vnc stuff

This commit is contained in:
Nick Bolton 2013-05-31 16:06:51 +00:00
parent 2be3ad7763
commit 9f25a1efcd
4 changed files with 1 additions and 21 deletions

2
hm.py
View File

@ -58,7 +58,7 @@ globalOptionsLong = ['no-prompts', 'generator=', 'verbose', 'make-gui']
cmd_opt_dict = { cmd_opt_dict = {
'about' : ['', []], 'about' : ['', []],
'setup' : ['g:', []], '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']], 'build' : ['dr', ['debug', 'release']],
'clean' : ['dr', ['debug', 'release']], 'clean' : ['dr', ['debug', 'release']],
'update' : ['', []], 'update' : ['', []],

View File

@ -55,10 +55,6 @@ if (UNIX)
) )
endif() endif()
if (VNC_SUPPORT)
list(APPEND libs vnc_server vnc_client)
endif()
include_directories(${inc}) include_directories(${inc})
add_executable(synergys ${src}) add_executable(synergys ${src})
target_link_libraries(synergys target_link_libraries(synergys

View File

@ -49,7 +49,6 @@ set(inc
CArgsBase.h CArgsBase.h
IAppUtil.h IAppUtil.h
CEventGameDevice.h CEventGameDevice.h
CVncClient.h
) )
set(src set(src
@ -79,7 +78,6 @@ set(src
CAppUtil.cpp CAppUtil.cpp
CArgsBase.cpp CArgsBase.cpp
CEventGameDevice.cpp CEventGameDevice.cpp
CVncClient.cpp
CGameDevice.cpp CGameDevice.cpp
) )
@ -119,10 +117,6 @@ if (UNIX)
list(APPEND inc list(APPEND inc
../../.. ../../..
) )
elseif (WIN32)
list(APPEND inc
../../vnc/win
)
endif() endif()
include_directories(${inc}) include_directories(${inc})

View File

@ -66,9 +66,6 @@ class InternalCommands:
# by default, do not compile with game device support. # by default, do not compile with game device support.
gameDevice = False gameDevice = False
# by default, do not compile with vnc support.
vncSupport = False
# by default, let cmake decide # by default, let cmake decide
macSdk = None macSdk = None
@ -192,11 +189,6 @@ class InternalCommands:
else: else:
cmake_args += " -DGAME_DEVICE_SUPPORT:BOOL=FALSE" 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: if self.macSdk:
path = "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk/" path = "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk/"
cmake_args += " -DCMAKE_OSX_SYSROOT=" + path cmake_args += " -DCMAKE_OSX_SYSROOT=" + path
@ -1238,8 +1230,6 @@ class CommandHandler:
self.qtDir = a self.qtDir = a
elif o == '--game-device': elif o == '--game-device':
self.ic.gameDevice = True self.ic.gameDevice = True
elif o == '--vnc':
self.ic.vncSupport = True
elif o == '--mac-sdk': elif o == '--mac-sdk':
self.ic.macSdk = a self.ic.macSdk = a