vlc/vlc-2.0 | branch: master | Benjamin Drung <[email protected]> | Thu Sep 6 15:07:22 2012 +0200| [a93776b5948909b259f16bb168b1171249d7ecd4] | committer: Rafaël Carré
Do not ship UAC.dll in source tarball. Close #7436 Signed-off-by: Rafaël Carré <[email protected]> (cherry picked from commit aff4cad782e0939afc520f82735ebfac27cd3b9c) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a93776b5948909b259f16bb168b1171249d7ecd4 --- Makefile.am | 1 - extras/package/win32/UAC.dll | Bin 14848 -> 0 bytes extras/package/win32/package.mak | 16 ++++++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 595dff1..d82b04b 100644 --- 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 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 33aad95..5c97d30 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -133,12 +133,24 @@ 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)/" 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 \ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
