fixed linux gui build and dist

CMakeLists.txt

@@ -40,7 +40,7 @@ project(synergy C CXX)
 
 # Set some easy to type variables.
 set(root_dir ${CMAKE_SOURCE_DIR})
-set(cmake_dir ${root_dir}/cmake)
+set(cmake_dir ${root_dir}/res)
 set(bin_dir ${root_dir}/bin)
 set(doc_dir ${root_dir}/doc)
 set(doc_dir ${root_dir}/doc)
@@ -283,12 +283,6 @@ if (CONF_CPACK)
 	   message(FATAL_ERROR "CPack support for Windows has been removed.")
 	endif()
 
-	install(TARGETS
-		synergys
-		synergyc
-		COMPONENT core
-		DESTINATION bin)
-
 	if (UNIX)
 		if (APPLE)
 			# no cpack support for apple
@@ -301,9 +295,9 @@ if (CONF_CPACK)
 				WORLD_READ WORLD_EXECUTE)
 
 			# install gnome menu item
-			install(FILES cmake/synergy.desktop
+			install(FILES res/synergy.desktop
 				DESTINATION share/applications)
-			install(FILES cmd/launcher/synergy.ico
+			install(FILES res/synergy.ico
 				DESTINATION share/icons)
 		endif()
 	endif()

src/cmd/synergyc/CMakeLists.txt

@@ -57,3 +57,10 @@ include_directories(${inc})
 add_executable(synergyc ${src})
 target_link_libraries(synergyc
 	arch base client common io mt net platform server synergy ${libs})
+
+if (CONF_CPACK)
+	install(TARGETS
+		synergyc
+		COMPONENT core
+		DESTINATION bin)
+endif()

src/cmd/synergys/CMakeLists.txt

@@ -57,3 +57,10 @@ include_directories(${inc})
 add_executable(synergys ${src})
 target_link_libraries(synergys
 	arch base client common io mt net platform server synergy ${libs})
+
+if (CONF_CPACK)
+	install(TARGETS
+		synergys
+		COMPONENT core
+		DESTINATION bin)
+endif()

src/gui/qsynergy.pro

@@ -80,8 +80,8 @@ release {
     RCC_DIR = tmp/release
 }
 win32 {
-	Debug:DESTDIR = ../bin/Debug
+	Debug:DESTDIR = ../../bin/Debug
-	Release:DESTDIR = ../bin/Release
+	Release:DESTDIR = ../../bin/Release
 } else {
-	DESTDIR = ../bin
+	DESTDIR = ../../bin
 }

tools/build/toolchain.py

@@ -35,9 +35,9 @@ class InternalCommands:
 	w32_qt_version = '4.6.2'
 
 	source_dir = '..' # Source, relative to build.
-	cmake_dir = 'cmake'
+	cmake_dir = 'res'
 	_bin_dir = 'bin'
-	gui_dir = 'gui'
+	gui_dir = 'src/gui'
 	doc_dir = 'doc'
 
 	sln_filename = '%s.sln' % project