From b8a83aaf62d908b5750627173f37f8a40ec65d00 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Tue, 28 Sep 2021 23:04:29 +0900 Subject: meson: Disable ARM64 support for Windows Disable Windows ARM64 support/build for now, because it doesn't work. Fixes: https://gitlab.freedesktop.org/gstreamer/orc/-/issues/36 Part-of: --- meson.build | 7 +++++-- orc/meson.build | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index d175b53..4b2d5bd 100644 --- a/meson.build +++ b/meson.build @@ -53,6 +53,7 @@ foreach b : all_backends endforeach cpu_family = host_machine.cpu_family() +host_system = host_machine.system() if cpu_family == 'x86' cdata.set('HAVE_I386', true) elif cpu_family == 'x86_64' @@ -61,12 +62,14 @@ elif cpu_family == 'ppc' or cpu_family == 'ppc64' cdata.set('HAVE_POWERPC', true) elif cpu_family == 'arm' cdata.set('HAVE_ARM', true) -elif cpu_family == 'aarch64' +# TODO: Add support for Windows +# https://gitlab.freedesktop.org/gstreamer/orc/-/issues/38 +elif cpu_family == 'aarch64' and host_system != 'windows' cdata.set('HAVE_AARCH64', true) elif cpu_family == 'mips' and host_machine.endian() == 'little' cdata.set('HAVE_MIPSEL', true) else - warning(cpu_family + ' isn\'t a supported cpu family for optimization') + warning(cpu_family + ' with ' + host_system + ' isn\'t a supported configuration for optimization') endif threads = dependency('threads') diff --git a/orc/meson.build b/orc/meson.build index 0213ed8..bb2c464 100644 --- a/orc/meson.build +++ b/orc/meson.build @@ -91,7 +91,9 @@ if cpu_family.startswith('x86') orc_sources += ['orccpu-x86.c'] elif cpu_family == 'ppc' or cpu_family == 'ppc64' orc_sources += ['orccpu-powerpc.c'] -elif cpu_family == 'arm' or cpu_family == 'aarch64' +# TODO: Add support for Windows +# https://gitlab.freedesktop.org/gstreamer/orc/-/issues/38 +elif (cpu_family == 'arm' or cpu_family == 'aarch64') and host_system != 'windows' orc_sources += ['orccpu-arm.c'] elif cpu_family == 'mips' and host_machine.endian() == 'little' orc_sources += ['orccpu-mips.c'] -- cgit v1.2.3