[vlc-commits] [Git][videolan/vlc][master] package/win32: give a different name to Windows ARM64 exe/msi/7z
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Sep 15 06:38:04 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
ac029e85 by Steve Lhomme at 2025-09-15T05:33:54+00:00
package/win32: give a different name to Windows ARM64 exe/msi/7z
Otherwise we don't know if the win64 is for arm or x86.
- - - - -
3 changed files:
- extras/package/win32/NSIS/vlc.win32.nsi.in
- extras/package/win32/msi.mak
- extras/package/win32/package.mak
Changes:
=====================================
extras/package/win32/NSIS/vlc.win32.nsi.in
=====================================
@@ -44,8 +44,9 @@ Var 32bitPath
;;;;;;;;;;;;;;;;;;;;;;;;;
Name "${PRODUCT_NAME}"
- at HAVE_WIN64_FALSE@ OutFile ..\vlc-${VERSION}-win32.exe
- at HAVE_WIN64_TRUE@ OutFile ..\vlc-${VERSION}-win64.exe
+ at HAVE_WIN64_FALSE@ OutFile ..\vlc-${VERSION}-win32.exe
+ at HAVE_WIN64_TRUE@@HAVE_ARM64_FALSE@ OutFile ..\vlc-${VERSION}-win64.exe
+ at HAVE_WIN64_TRUE@@HAVE_ARM64_TRUE@ OutFile ..\vlc-${VERSION}-winarm64.exe
InstallDir "$@PROGRAMFILES@\VideoLAN\VLC"
!ifdef NSIS_LZMA_COMPRESS_WHOLE
SetCompressor lzma
=====================================
extras/package/win32/msi.mak
=====================================
@@ -11,11 +11,15 @@ MSIDIR=$(abs_srcdir)/extras/package/win32/msi
W_MSIDIR=`$(WIN32_PATH_CMD) -w '$(MSIDIR)'`
MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi
W_MSIBUILDDIR=`$(WIN32_PATH_CMD) -w '$(MSIBUILDDIR)'`
+if HAVE_ARM64
+MSIOUTFILE=vlc-$(VERSION)-winarm64.msi
+else
if HAVE_WIN64
MSIOUTFILE=vlc-$(VERSION)-win64.msi
else
MSIOUTFILE=vlc-$(VERSION)-win32.msi
endif
+endif
heat: package-win-strip
$(HEAT) --dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Plugins.fragment.wxs
=====================================
extras/package/win32/package.mak
=====================================
@@ -15,11 +15,15 @@ include extras/package/npapi.am
build-npapi: package-win-install
endif
+if HAVE_ARM64
+WINVERSION=vlc-$(VERSION)-winarm64
+else
if HAVE_WIN64
WINVERSION=vlc-$(VERSION)-win64
else
WINVERSION=vlc-$(VERSION)-win32
endif
+endif
package-win-install:
$(MAKE) install
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ac029e853f7c0e3a1a5f635776c784657e43b066
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ac029e853f7c0e3a1a5f635776c784657e43b066
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list