comparison system/Init.cpp @ 658:29efe322ab47

* Build fixes

     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
 #include <iostream>
+
+#include <qglobal.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>

 #endif
 
 #ifdef Q_WS_WIN32
 
 #include <fcntl.h>
+
+// required for SetDllDirectory
+#define _WIN32_WINNT 0x0502
 #include <windows.h>
 
 // Set default file open mode to binary
 //#undef _fmode
 //int _fmode = _O_BINARY;
 
 void redirectStderr()
 {
+#ifdef NO_PROBABLY_NOT
     HANDLE stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
     if (!stderrHandle) return;
 
     AllocConsole();
 

         if (fd) {
             *stderr = *fd;
             setvbuf(stderr, NULL, _IONBF, 0);
         }
     }
+#endif
 }
 
 #endif
 
 extern void svSystemSpecificInitialisation()

     XSetErrorHandler(handle_x11_error);
 #endif
 
 #ifdef Q_WS_WIN32
     redirectStderr();
+
+    // Remove the CWD from the DLL search path, just in case
+    SetDllDirectory(L"");
+    putenv("PATH=");
 #else
 #endif
 }