Anpassungen fuer Win32-build.

Aufspaltung der ClientGUIUtils in 2 Versionen
Anpassungen des HomeDir

Alle Aenderungen sollten unschaedlich fuer den Linux-build-Prozess sein.

1 files changed, 74 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9570774..d2eae17 100644..100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,8 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.6.2 )
 # set compiler optimizations for debug and release
 SET(CMAKE_BUILD_TYPE Debug)
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
-# -march=native -DQT_NO_DEBUG_OUTPUT")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native")
+# -DQT_NO_DEBUG_OUTPUT")
 
 # local cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
@@ -31,6 +31,15 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_BINARY_DIR}
 )
 
+IF(WIN32)
+    SET(sysdep_suffix _Win32)
+	INCLUDE_DIRECTORIES(
+        /c/KDE4/tmp/LibVNCServer-0.9.7/
+    )
+ELSEIF(UNIX)
+    SET(sysdep_suffix _X11)
+ENDIF(WIN32)
+
 ################################################################################
 # Variables
 ################################################################################
@@ -78,7 +87,7 @@ SET( PVS_SRCS
     src/net/pvsLocalhostCommunicator.cpp
     src/util/util.cpp
     src/util/consoleLogger.cpp
-    src/util/clientGUIUtils.cpp
+    src/util/clientGUIUtils${sysdep_suffix}.cpp
     src/util/pvsSettingsManager.cpp
     src/core/pvsChatClient.cpp
     src/net/pvsServiceDiscovery.cpp
@@ -262,6 +271,7 @@ QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_UI_HDRS} ${PVSGUI_TSS
 ################################################################################
 
 ## here we instruct CMake to build our executable from all of the source files
+if(UNIX)
 ADD_EXECUTABLE( pvsmgr 
     ${PVSMGR_SRCS}
     ${PVSMGR_MOC_SRCS}
@@ -277,6 +287,7 @@ ADD_EXECUTABLE( pvsmgrtouch
     ${PVSMGR_RC_SRCS}
     ${PVSMGR_QMS}
 )
+ENDIF(UNIX)
 
 ADD_EXECUTABLE( pvs 
     ${PVS_SRCS}
@@ -295,35 +306,72 @@ ADD_EXECUTABLE( pvsgui
 
 # last thing we have to do is to tell CMake what libraries our executable needs,
 # luckily FIND_PACKAGE prepared variables for us:
-TARGET_LINK_LIBRARIES( pvsmgr
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-    ${X11_LIBRARIES}
-)
-
-TARGET_LINK_LIBRARIES( pvsmgrtouch
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-    ${X11_LIBRARIES}
-)
-
-TARGET_LINK_LIBRARIES( pvs
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-    ${X11_LIBRARIES}
-)
-
-TARGET_LINK_LIBRARIES( pvsgui
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-)
 
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvsmgr
+        
+    )
+ELSEIF(UNIX)
+TARGET_LINK_LIBRARIES( pvsmgr
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        ${X11_LIBRARIES}
+    )
+ENDIF(WIN32)
+
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvsmgrtouch
+        
+    )
+ELSEIF(UNIX)
+    TARGET_LINK_LIBRARIES( pvsmgrtouch
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        ${X11_LIBRARIES}
+    )
+ENDIF(WIN32)
+
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvs
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        advapi32
+        ws2_32
+    )
+ELSEIF(UNIX)
+    TARGET_LINK_LIBRARIES( pvs
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        ${X11_LIBRARIES}
+    )
+ENDIF(WIN32)
+
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvsgui
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        #advapi32
+        ws2_32
+    )
+ELSEIF(UNIX)
+    TARGET_LINK_LIBRARIES( pvsgui
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+    )
+ENDIF(WIN32)
+
+IF(UNIX)
 SET_PROPERTY(TARGET pvsmgrtouch PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_TOUCHGUI)
 SET_PROPERTY(TARGET pvsmgr PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_NORMALGUI)  
+ENDIF(UNIX)
 
 # add install target to our makefile
 CONFIGURE_FILE( org.openslx.pvs.service ${CMAKE_BINARY_DIR}/org.openslx.pvs.service )
-INSTALL( TARGETS pvsmgr pvs pvsgui pvsmgrtouch RUNTIME DESTINATION bin )
+IF(WIN32)
+    INSTALL( TARGETS pvs pvsgui RUNTIME DESTINATION bin )
+ELSEIF(UNIX)
+    INSTALL( TARGETS pvsmgr pvs pvsgui pvsmgrtouch RUNTIME DESTINATION bin )
+ENDIF(WIN32)
 INSTALL( PROGRAMS misc/pvs-vncsrv DESTINATION bin)
 INSTALL( FILES ${CMAKE_BINARY_DIR}/org.openslx.pvs.service DESTINATION share/dbus-1/services )