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, 15 insertions, 7 deletions

diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp
index e87bfe7..e9479df 100644..100755
--- a/src/pvsDaemon.cpp
+++ b/src/pvsDaemon.cpp
@@ -68,11 +68,17 @@ int main(int argc, char** argv)
     int port = -1;
 
     QFileInfo script;
-    script.setFile("/usr/bin/pvs-vncsrv");
-    if (!script.exists())
-        script.setFile("/usr/local/bin/pvs-vncsrv");
-    if (!script.exists())
-        script.setFile("/home/" + getUserName() + "/.pvs/pvs-vncsrv");
+    #ifdef __WIN32__
+        //TODO Win32
+        if (!script.exists())
+            script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat");
+    #else
+        script.setFile("/usr/bin/pvs-vncsrv");
+        if (!script.exists())
+            script.setFile("/usr/local/bin/pvs-vncsrv");
+        if (!script.exists())
+            script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv");
+    #endif //__WIN32__
 
     QCoreApplication app(argc, argv);
     app.setOrganizationName("openslx");
@@ -293,6 +299,8 @@ int main(int argc, char** argv)
 
 #ifdef as_daemon
 
+    /*Alex: neu schreiben als pvsdaemon_win32.cpp und minimieren in Task-Leiste*/
+    #ifndef __WIN32__
     /* Our process ID and Session ID */
     pid_t pid, sid;
 
@@ -331,10 +339,10 @@ int main(int argc, char** argv)
 
     /* Close out the standard file descriptors */
     close(STDIN_FILENO);
-    freopen ((QString("/home/").append(getUserName().append(QString("/.pvs/dump")))).toUtf8().data(),"w",stdout);
+    freopen ((QString(getHomeDir()).append(QString("/.pvs/dump"))).toUtf8().data(),"w",stdout);
     //close(STDOUT_FILENO);
     close(STDERR_FILENO);
-
+    #endif /*__WIN32__*/
     /* Daemon-specific initialization goes here */
 
     /* The Big Loop */