Commit a93776b5 authored by Benjamin Drung's avatar Benjamin Drung Committed by Rafaël Carré

Do not ship UAC.dll in source tarball.

Close #7436
Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
(cherry picked from commit aff4cad782e0939afc520f82735ebfac27cd3b9c)
Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
parent df646e71
...@@ -24,7 +24,6 @@ EXTRA_DIST = \ ...@@ -24,7 +24,6 @@ EXTRA_DIST = \
extras/package/win32/vlc.win32.nsi.in \ extras/package/win32/vlc.win32.nsi.in \
extras/package/win32/spad.nsi.in \ extras/package/win32/spad.nsi.in \
extras/package/win32/UAC.nsh \ extras/package/win32/UAC.nsh \
extras/package/win32/UAC.dll \
extras/package/win32/languages/declaration.nsh \ extras/package/win32/languages/declaration.nsh \
extras/package/win32/languages/bengali.nsh \ extras/package/win32/languages/bengali.nsh \
extras/package/win32/languages/basque.nsh \ extras/package/win32/languages/basque.nsh \
......
...@@ -133,12 +133,24 @@ package-win32-crx: package-win32-webplugin-common ...@@ -133,12 +133,24 @@ package-win32-crx: package-win32-webplugin-common
--extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf --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 # Script installer
cd "$(top_builddir)/extras/package/win32" && cp vlc.win32.nsi spad.nsi "$(win32_destdir)/" 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/languages/ "$(win32_destdir)/"
mkdir -p "$(win32_destdir)/NSIS/" 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 # Create package
if makensis -VERSION >/dev/null 2>&1; then \ if makensis -VERSION >/dev/null 2>&1; then \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment