[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: configure.ac: Detect aarch64 as a 64bits windows

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
02084f72 by Hugo Beauzée-Luyssen at 2024-11-16T11:10:56+00:00
configure.ac: Detect aarch64 as a 64bits windows

(cherry picked from commit 94ba3ab49628827a6bcbff9a805350ab41c37d7a)

- - - - -
225b649e by Martin Storsjö at 2024-11-16T11:10:56+00:00
configure: Don't set X86ASMFLAGS for windows on arm

This avoids enabling HAVE_X86ASM in these configurations, fixing
compilation.

Also set proper values for WINDOWS_ARCH in these configurations.

(cherry picked from commit 4285591989568484ec1c7478da1a519d82d8f2b0)

edited:
- 616d1a05b1011450bae637b029c98eec071a26eb was cherrypicked before
  (as 64e099576f908ad29205cd77a7dd1f0ea8053447), causing compilation
  to fail for non-x86 Windows targets in 3.0. This caused some minor
  conflicts in cherrypicking this patch.

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -288,12 +288,22 @@ case "${host_os}" in
         dnl NSIS/MSI Installer prefix and WIN64
         dnl
         case "${host_cpu}" in
+            aarch64)
+                HAVE_WIN64="1"
+                WINDOWS_ARCH="arm64"
+                PROGRAMFILES="PROGRAMFILES64"
+                LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
+            ;;
             amd64|x86_64)
                 HAVE_WIN64="1"
                 WINDOWS_ARCH="x64"
                 PROGRAMFILES="PROGRAMFILES64"
                 LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
             ;;
+            armv7)
+                WINDOWS_ARCH="arm"
+                PROGRAMFILES="PROGRAMFILES"
+            ;;
             i?86)
                 WINDOWS_ARCH="x86"
                 PROGRAMFILES="PROGRAMFILES"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9999ce93eba814d9d92334322f64335693ccb78e...225b649ec51fe4ff4b8f47cdd8885f960757357d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9999ce93eba814d9d92334322f64335693ccb78e...225b649ec51fe4ff4b8f47cdd8885f960757357d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance