X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkUtilities.cxx;fp=kernel%2Fsrc%2FbbtkUtilities.cxx;h=a7285fed13e6e80efd8b93cdba1d9e3747f26acb;hb=feaad5f26780e5ea143af6da2e000e7058336b36;hp=7e85dc76787497b9e350fc332188b4283f88304b;hpb=9c6b34ade419c6f122fedac19563dca4c2407bc2;p=bbtk.git

diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index 7e85dc7..a7285fe 100644
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.cxx
@@ -39,6 +39,11 @@
 #include "bbtkUtilities.h"
 #include "bbtkMessageManager.h"
 
+//EED 2018-07-16
+#if defined(_WIN32) 
+	#include <shlwapi.h>
+#endif
+
 #if defined(MACOSX) // assume this is OSX 
 # include <sys/param.h>
 # include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line 
@@ -633,7 +638,11 @@ namespace bbtk
 #endif /* LINUX */
     
 #ifdef WIN32
-    long result = GetModuleFileName(NULL, pname, pathsize);
+//2018-07-06 mingw64
+    wchar_t pname2[512];
+	mbstowcs(pname2,pname,strlen(pname)+1);
+    long result = GetModuleFileName(NULL, pname2, pathsize);
+//    long result = GetModuleFileName(NULL, pname, pathsize);
     if (result > 0)
       {
 	/* fix up the dir slashes... */