[vlc-commits] contrib: Set HAVE_WIN64 for aarch64 as well

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Sat Dec 16 22:03:24 2017 +0200| [25d20bfd9fa8c9ea98e1bf1485faa77887065bbc] | committer: Jean-Baptiste Kempf

contrib: Set HAVE_WIN64 for aarch64 as well

Adjust some existing uses of this variable to check for HAVE_WIN32
+ x86_64 instead.

(cherry picked from commit b8cc73293ccd4ff84613d6395daacca52e9da7bf)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=25d20bfd9fa8c9ea98e1bf1485faa77887065bbc
---

 contrib/src/ffmpeg/rules.mak | 2 +-
 contrib/src/gcrypt/rules.mak | 4 +++-
 contrib/src/gnutls/rules.mak | 2 +-
 contrib/src/main.mak         | 3 +++
 contrib/src/theora/rules.mak | 4 +++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b9f8fc86f1..0fc063a501 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -187,7 +187,7 @@ else
 FFMPEGCONF += --disable-dxva2
 endif
 
-ifdef HAVE_WIN64
+ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
 else
 ifeq ($(ARCH),i386) # 32bits intel
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index eff80415a1..36bc4f8023 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -34,9 +34,11 @@ GCRYPT_CONF = \
 	--enable-pubkey-ciphers=dsa,rsa,ecc \
 	--disable-docs
 
-ifdef HAVE_WIN64
+ifdef HAVE_WIN32
+ifeq ($(ARCH),x86_64)
 GCRYPT_CONF += --disable-asm --disable-padlock-support
 endif
+endif
 ifdef HAVE_IOS
 GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
 else
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index a162adf927..9cd29beead 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -71,7 +71,7 @@ ifdef HAVE_TIZEN
 	GNUTLS_CONF += --with-default-trust-store-dir=/etc/ssl/certs/
 endif
 ifdef HAVE_WINSTORE
-ifdef HAVE_WIN64
+ifeq ($(ARCH),x86_64)
 	GNUTLS_CONF += --disable-hardware-acceleration
 endif
 endif
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index e423b1641f..b20a5675eb 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -44,6 +44,9 @@ ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
 ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
 HAVE_WIN64 := 1
 endif
+ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
+HAVE_WIN64 := 1
+endif
 
 ifdef HAVE_CROSS_COMPILE
 need_pkg = 1
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index f253fdfa51..a9ca4d1ad4 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -39,9 +39,11 @@ endif
 ifdef HAVE_IOS
 THEORACONF += --disable-asm
 endif
-ifdef HAVE_WIN64
+ifdef HAVE_WIN32
+ifeq ($(ARCH),x86_64)
 THEORACONF += --disable-asm
 endif
+endif
 
 DEPS_theora = ogg $(DEPS_ogg)