Merge branch 'master' of openslx.org:pvs

Conflicts:
	CMakeLists.txt
	src/core/pvsConnectionManager.cpp
	src/pvs.cpp
	src/pvs.h

1 files changed, 53 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 433afb9..c111ebc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,8 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.6.2 )
 
 # set compiler optimizations for debug and release
 SET(CMAKE_BUILD_TYPE Debug)
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall")
+SET(CMAKE_C_FLAGS_RELEASE "-O3 -march=native")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -DQT_NO_DEBUG_OUTPUT" )
 
@@ -25,8 +27,20 @@ FIND_PACKAGE( VNC REQUIRED )
 INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
+    ${X11_INCLUDE_DIR}
+    ${X11_XTest_INCLUDE_PATH}
+    ${X11_Xinput_INCLUDE_PATH}
 )
 
+IF(NOT X11_XTest_FOUND)
+    MESSAGE(FATAL_ERROR "Could not find X11 extension XTest or its developer files.")
+ENDIF()
+IF(NOT X11_Xinput_FOUND)
+	MESSAGE(FATAL_ERROR "Could not find X11 extension Xinput or its developer files.")
+ENDIF()
+
+ADD_SUBDIRECTORY(src/input)
+
 IF(WIN32)
     SET(sysdep_suffix _Win32)
 	INCLUDE_DIRECTORIES(
@@ -43,6 +57,18 @@ ADD_SUBDIRECTORY(3rdparty/qtsingleapplication)
 
 
 ################################################################################
+# Build third-party libraries
+################################################################################
+
+ADD_SUBDIRECTORY(3rdparty)
+
+################################################################################
+# Common multicast transfer module
+################################################################################
+
+ADD_SUBDIRECTORY(src/net/mcast)
+
+################################################################################
 # Variables
 ################################################################################
 
@@ -79,6 +105,14 @@ SET( PVSMGR_SRCS
     src/gui/processesDialog.cpp
     src/gui/processesStartDialog.cpp
     src/gui/processWidget.cpp
+    src/gui/multicastConfigDialog.cpp
+    
+    # We need the following headers for translations.
+    # They will not be compiled.
+    src/input/killX11Handler.h
+    src/input/rebootSystemHandler.h
+    src/input/sayHelloHandler.h
+    src/input/magicSysRqHandler.h
 )
 
 # pvs
@@ -97,6 +131,8 @@ SET( PVS_SRCS
     src/net/pvsDiscoveredServer.cpp
     src/util/TextFile.cpp
     src/util/serviceDiscoveryUtil.cpp
+    src/net/pvsOutgoingMulticastTransfer.cpp
+    src/net/pvsIncomingMulticastTransfer.cpp
 )
 
 # pvsgui
@@ -112,6 +148,7 @@ SET( PVSGUI_SRCS
     src/util/vncClientThread.cpp
     src/util/TextFile.cpp
     src/gui/aboutDialog.cpp
+    src/net/pvsNetworkInterfaceListModel.cpp
 )
 
 
@@ -131,6 +168,7 @@ SET( PVSMGR_UIS
     src/gui/ui/clientFileSendDialog.ui
     src/gui/ui/processesDialog.ui
     src/gui/ui/processWidget.ui
+    src/gui/ui/multicastConfigDialog.ui
 )
 
 SET( PVSMGRTOUCH_UIS
@@ -141,6 +179,7 @@ SET( PVSMGRTOUCH_UIS
     src/gui/ui/projectionDialog.ui
     src/gui/ui/aboutDialog.ui
     src/gui/ui/serverChatDialog.ui
+    src/gui/ui/multicastConfigDialog.ui
 )
 
 SET( PVSGUI_UIS
@@ -190,6 +229,7 @@ SET( PVSMGR_MOC_HDRS
     src/gui/aboutDialog.h
     src/gui/processesDialog.h
     src/gui/processWidget.h
+    src/gui/multicastConfigDialog.h
 )
 
 SET( PVS_MOC_HDRS
@@ -198,6 +238,8 @@ SET( PVS_MOC_HDRS
     src/net/pvsServerConnection.h
     src/net/pvsServiceDiscovery.h
     src/net/pvsDiscoveredServer.h
+    src/net/pvsOutgoingMulticastTransfer.h
+    src/net/pvsIncomingMulticastTransfer.h
 )
 
 SET( PVSGUI_MOC_HDRS
@@ -211,6 +253,7 @@ SET( PVSGUI_MOC_HDRS
     src/gui/clientInfoDialog.h
     src/util/vncClientThread.h
     src/gui/aboutDialog.h
+    src/net/pvsNetworkInterfaceListModel.h
 )
 
 # i18n (Qt)
@@ -328,6 +371,8 @@ TARGET_LINK_LIBRARIES( pvsmgr
         ${QT_LIBRARIES}
         ${VNC_LIBRARIES}
         ${X11_LIBRARIES}
+	pvsmcast
+        pvsinput
     )
 ENDIF(WIN32)
 
@@ -340,6 +385,8 @@ ELSEIF(UNIX)
         ${QT_LIBRARIES}
         ${VNC_LIBRARIES}
         ${X11_LIBRARIES}
+	pvsmcast
+        pvsinput
     )
 ENDIF(WIN32)
 
@@ -355,6 +402,10 @@ ELSEIF(UNIX)
         ${QT_LIBRARIES}
         ${VNC_LIBRARIES}
         ${X11_LIBRARIES}
+        ${X11_XTest_LIB}
+        ${X11_Xinput_LIB}
+        pvsmcast
+        pvsinput
     )
 ENDIF(WIN32)
 
@@ -404,8 +455,8 @@ SET( CPACK_GENERATOR "DEB;RPM" )
 SET( CPACK_SET_DESTDIR "ON" )
 SET( CPACK_PACKAGE_NAME "pvs" )
 SET( CPACK_PACKAGE_VERSION_MAJOR "2" )
-SET( CPACK_PACKAGE_VERSION_MINOR "0" )
-SET( CPACK_PACKAGE_VERSION_PATCH "3" )
+SET( CPACK_PACKAGE_VERSION_MINOR "8" )
+SET( CPACK_PACKAGE_VERSION_PATCH "0" )
 SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" )
 SET( CPACK_PACKAGE_DESCRIPTION "")
 SET( CPACK_PACKAGE_CONTACT "Simon Wittenberg <wittenb@informatik.uni-freiburg.de>" )