vlc | branch: master | Marvin Scholz <[email protected]> | Wed Nov 15 00:32:35 
2017 +0100| [726156dce53831aacdaaab8e6eeb128b022a8b27] | committer: Marvin 
Scholz

NSIS/nsProcess: Enable unicode

With NSIS 3 and unicode enabled, nsProcess needs to be compiled with
UNICODE and _UNICODE defined, so that the correct types are used, else
it will not work as expected.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=726156dce53831aacdaaab8e6eeb128b022a8b27
---

 extras/package/win32/package.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 97f3fc4d04..8661917ffb 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -124,10 +124,10 @@ package-win32-crx: package-win32-webplugin-common
 $(win32_destdir)/NSIS/nsProcess.dll: 
extras/package/win32/NSIS/nsProcess/nsProcess.c 
extras/package/win32/NSIS/nsProcess/pluginapi.c
        mkdir -p "$(win32_destdir)/NSIS/"
 if HAVE_WIN64
-       i686-w64-mingw32-gcc $^ -shared -o $@ -lole32 -static-libgcc
+       i686-w64-mingw32-gcc $^ -shared -o $@ -lole32 -static-libgcc 
-D_UNICODE=1 -DUNICODE=1
        i686-w64-mingw32-strip $@
 else
-       $(CC) $^ -D_WIN32_IE=0x0601 -shared -o $@ -lole32 -static-libgcc
+       $(CC) $^ -D_WIN32_IE=0x0601 -shared -o $@ -lole32 -static-libgcc 
-D_UNICODE=1 -DUNICODE=1
        $(STRIP) $@
 endif
 

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to