Commit 761ad447 authored by Marvin Scholz's avatar Marvin Scholz

package/win32: Use 7z found by configure

Additionally rename 7Z_OPTS to 7ZIP_OPTS, to match the 7ZIP program
variable name.
parent b3b0dc2c
......@@ -7,7 +7,7 @@ win32_destdir=$(top_builddir)/vlc-$(VERSION)
win32_debugdir=$(abs_top_builddir)/symbols-$(VERSION)
win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION)
7Z_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on
7ZIP_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on
if HAVE_WIN32
......@@ -148,10 +148,10 @@ package-win32-debug-zip: package-win-common
zip -r -9 $(WINVERSION)-debug.zip vlc-$(VERSION)
package-win32-7zip: package-win-strip
7z a $(7Z_OPTS) $(WINVERSION).7z vlc-$(VERSION)
$(7ZIP) a $(7ZIP_OPTS) $(WINVERSION).7z vlc-$(VERSION)
package-win32-debug-7zip: package-win-common
7z a $(7Z_OPTS) $(WINVERSION)-debug.7z vlc-$(VERSION)
$(7ZIP) a $(7ZIP_OPTS) $(WINVERSION)-debug.7z vlc-$(VERSION)
package-win32-cleanup:
rm -Rf $(win32_destdir) $(win32_debugdir) $(win32_xpi_destdir)
......@@ -176,7 +176,7 @@ package-win32-release: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll pac
cp $(top_srcdir)/extras/package/win32/msi/LICENSE.rtf "$(win32_destdir)/msi/"
cp $(top_srcdir)/extras/package/win32/msi/product.wxs "$(win32_destdir)/msi/"
7z a $(7Z_OPTS) $(WINVERSION)-release.7z $(win32_debugdir) "$(win32_destdir)/"
$(7ZIP) a $(7ZIP_OPTS) $(WINVERSION)-release.7z $(win32_debugdir) "$(win32_destdir)/"
#######
# WinCE
......
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