Merge pull request #582 from eile/master

Use lunchbox::getWorkDir()

.gitsubprojects

@@ -1,9 +1,9 @@
 # -*- mode: cmake -*-
 git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git caa86d8)
 git_subproject(Servus https://github.com/HBPVIS/Servus 5afd636)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git de2a635)
-git_subproject(Pression https://github.com/Eyescale/Pression.git ce35183)
-git_subproject(hwsd https://github.com/Eyescale/hwsd.git 4e64bd2)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 96ba6b9)
+git_subproject(Pression https://github.com/Eyescale/Pression.git 8ce1a32)
+git_subproject(hwsd https://github.com/Eyescale/hwsd.git 04c7cd9)
 git_subproject(Collage https://github.com/Eyescale/Collage.git 625e3ac)
 git_subproject(GLStats https://github.com/Eyescale/GLStats.git 840c29d)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git ec4b162)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 37a42c4)

eq/init.cpp

@@ -54,8 +54,6 @@
 #include <fstream>
 
 #ifdef _MSC_VER
-#  include <direct.h>
-#  define getcwd _getcwd
 #  define atoll _atoi64
 #endif
 #ifndef MAXPATHLEN
@@ -130,10 +128,7 @@ bool _init( const int argc, char** argv, NodeFactory* nodeFactory )
 
     const std::string& workDir = Global::getWorkDir();
     if( workDir.empty( ))
-    {
-        char cwd[MAXPATHLEN];
-        Global::setWorkDir( getcwd( cwd, MAXPATHLEN ));
-    }
+        Global::setWorkDir( lunchbox::getWorkDir( ));
 
     _initPlugins();
     return fabric::init( argc, argv );