Do not ship UAC.dll in source tarball.

Close #7436

Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/Makefile.am b/Makefile.am
index ec653b963e63518f454e30859475933b9f4f5308..d15033a6b2f97d2b728aacce6fc3580f2b943e1a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = \
        extras/package/win32/vlc.win32.nsi.in \
        extras/package/win32/spad.nsi.in \
        extras/package/win32/UAC.nsh \
-       extras/package/win32/UAC.dll \
        extras/package/win32/languages/declaration.nsh \
        extras/package/win32/languages/bengali.nsh \
        extras/package/win32/languages/basque.nsh \

diff --git a/extras/package/win32/UAC.dll b/extras/package/win32/UAC.dll
deleted file mode 100755 (executable)
index 9c0390c..0000000
Binary files a/extras/package/win32/UAC.dll and /dev/null differ

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 9de0d1c55f0453100b5d00f7f91bb85b62d46107..3e9cab57a609c68e75f5fe2fec3c66f4fceb7185 100644 (file)
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -129,13 +129,25 @@ package-win32-crx: package-win32-webplugin-common
                --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 
 
-package-win32-exe: package-win-strip
+# nsis is a 32-bits installer, we need to build a 32bits DLL
+$(win32_destdir)/NSIS/UAC.dll: extras/package/win32/UAC/runas.cpp extras/package/win32/UAC/uac.cpp
+       mkdir -p "$(win32_destdir)/NSIS/"
+if HAVE_WIN64
+       i686-w64-mingw32-g++ $^ -shared -o $@ -lole32
+       i686-w64-mingw32-strip $@
+else
+       $(CXX) $^ -shared -o $@ -lole32
+       $(STRIP) $@
+endif
+
+
+package-win32-exe: package-win-strip $(win32_destdir)/NSIS/UAC.dll
 # Script installer
        cd "$(top_builddir)/extras/package/win32" && cp vlc.win32.nsi spad.nsi "$(win32_destdir)/"
        cp -r $(srcdir)/extras/package/win32/languages/ "$(win32_destdir)/"
        cp -r $(srcdir)/extras/package/win32/helpers/ "$(win32_destdir)/"
        mkdir -p "$(win32_destdir)/NSIS/"
-       cd "$(top_srcdir)/extras/package/win32/" && cp UAC.dll UAC.nsh "$(win32_destdir)/NSIS"
+       cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS/"
 
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \