vlc | branch: master | Martin Storsjö <[email protected]> | Thu Feb 7 12:35:33 2019 +0200| [4285591989568484ec1c7478da1a519d82d8f2b0] | committer: Martin Storsjö
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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4285591989568484ec1c7478da1a519d82d8f2b0 --- configure.ac | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1e142f42c9..36a6335427 100644 --- a/configure.ac +++ b/configure.ac @@ -271,13 +271,23 @@ case "${host_os}" in dnl NSIS/MSI Installer prefix and WIN64 dnl case "${host_cpu}" in - amd64|x86_64|aarch64) + 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" X86ASMFLAGS="-f win64" ;; + armv7) + WINDOWS_ARCH="arm" + PROGRAMFILES="PROGRAMFILES" + ;; *) WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
