Commit b8cc7329 authored by Martin Storsjö's avatar Martin Storsjö

contrib: Set HAVE_WIN64 for aarch64 as well

Adjust some existing uses of this variable to check for HAVE_WIN32
+ x86_64 instead.
parent 202f9d07
...@@ -187,7 +187,7 @@ else ...@@ -187,7 +187,7 @@ else
FFMPEGCONF += --disable-dxva2 FFMPEGCONF += --disable-dxva2
endif endif
ifdef HAVE_WIN64 ifeq ($(ARCH),x86_64)
FFMPEGCONF += --cpu=athlon64 --arch=x86_64 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
else else
ifeq ($(ARCH),i386) # 32bits intel ifeq ($(ARCH),i386) # 32bits intel
......
...@@ -34,9 +34,11 @@ GCRYPT_CONF = \ ...@@ -34,9 +34,11 @@ GCRYPT_CONF = \
--enable-pubkey-ciphers=dsa,rsa,ecc \ --enable-pubkey-ciphers=dsa,rsa,ecc \
--disable-docs --disable-docs
ifdef HAVE_WIN64 ifdef HAVE_WIN32
ifeq ($(ARCH),x86_64)
GCRYPT_CONF += --disable-asm --disable-padlock-support GCRYPT_CONF += --disable-asm --disable-padlock-support
endif endif
endif
ifdef HAVE_IOS ifdef HAVE_IOS
GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
else else
......
...@@ -71,7 +71,7 @@ ifdef HAVE_TIZEN ...@@ -71,7 +71,7 @@ ifdef HAVE_TIZEN
GNUTLS_CONF += --with-default-trust-store-dir=/etc/ssl/certs/ GNUTLS_CONF += --with-default-trust-store-dir=/etc/ssl/certs/
endif endif
ifdef HAVE_WINSTORE ifdef HAVE_WINSTORE
ifdef HAVE_WIN64 ifeq ($(ARCH),x86_64)
GNUTLS_CONF += --disable-hardware-acceleration GNUTLS_CONF += --disable-hardware-acceleration
endif endif
endif endif
......
...@@ -44,6 +44,9 @@ ARCH := $(shell $(SRC)/get-arch.sh $(HOST)) ...@@ -44,6 +44,9 @@ ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1) ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1 HAVE_WIN64 := 1
endif endif
ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
HAVE_WIN64 := 1
endif
ifdef HAVE_CROSS_COMPILE ifdef HAVE_CROSS_COMPILE
need_pkg = 1 need_pkg = 1
......
...@@ -39,9 +39,11 @@ endif ...@@ -39,9 +39,11 @@ endif
ifdef HAVE_IOS ifdef HAVE_IOS
THEORACONF += --disable-asm THEORACONF += --disable-asm
endif endif
ifdef HAVE_WIN64 ifdef HAVE_WIN32
ifeq ($(ARCH),x86_64)
THEORACONF += --disable-asm THEORACONF += --disable-asm
endif endif
endif
DEPS_theora = ogg $(DEPS_ogg) DEPS_theora = ogg $(DEPS_ogg)
......
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