Issues with non-ASCII chars in path or filename #604

* fix last commit
matlo · Jan 20, 2019 · d67e2f9 · d67e2f9
1 parent 2726340
commit d67e2f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/Makefile b/core/Makefile
@@ -40,7 +40,7 @@ LDLIBS += `xml2-config --libs`
 ifneq ($(OS),Windows_NT)
 LDLIBS += -lm `pkg-config --libs ncursesw` -lbluetooth -lmhash
 else
-LDLIBS += $(shell sdl2-config --libs) -lws2_32 -lpdcursesw -lintl -lshell32 -luuid
+LDLIBS += $(shell sdl2-config --libs) -lws2_32 -lpdcursesw -lintl -lshell32 -luuid -lole32
 LDLIBS:=$(filter-out -mwindows,$(LDLIBS))
 endif
 CPPFLAGS += -Iinclude -Iconnectors/btstack/include -Iconnectors/btstack/src

diff --git a/core/gimx.c b/core/gimx.c
@@ -22,6 +22,7 @@
 #include <windows.h>
 #include <shlobj.h> //to get the homedir
 #include <knownfolders.h>
+#include <objbase.h>
 #endif
 
 #include "gimx.h"
@@ -359,7 +360,7 @@ int main(int argc, char *argv[])
     goto QUIT;
   }
   gimx_params.homedir = utf16le_to_utf8(path);
-  free(path);
+  CoTaskMemFree(path);
 #endif
 
   if (gprio() < 0)