From bf8b5de6b9eae3e6fe3a56514ca984285b9b36c2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 30 Jul 2019 15:41:06 +0100 Subject: [PATCH] scons+meson: suppress spammy build warning on MacOS Originally introduced in c7f36574506838274460 ("darwin: Suppress type conversion warnings for GLhandleARB") to fix Bugzilla #66346 [1], this workaround was never ported to Scons or Meson. [1] https://bugs.freedesktop.org/66346 Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Eric Engestrom Reviewed-by: Jose Fonseca --- meson.build | 1 + scons/gallium.py | 1 + 2 files changed, 2 insertions(+) diff --git a/meson.build b/meson.build index c9f96e7135d..7e8fee2ee2a 100644 --- a/meson.build +++ b/meson.build @@ -252,6 +252,7 @@ endif if host_machine.system() == 'darwin' with_dri_platform = 'apple' + pre_args += '-DBUILDING_MESA' elif ['windows', 'cygwin'].contains(host_machine.system()) with_dri_platform = 'windows' elif system_has_kms_drm diff --git a/scons/gallium.py b/scons/gallium.py index 6d5b2fccc17..f208c638a0d 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -352,6 +352,7 @@ def generate(env): '_DARWIN_C_SOURCE', 'GLX_USE_APPLEGL', 'GLX_DIRECT_RENDERING', + 'BUILDING_MESA', ] else: cppdefines += [ -- 2.30.2