From 224e5012105b6476eb0572bd90d1a72b19ba6899 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 21 Oct 2022 23:19:46 +0800 Subject: [PATCH] aco: Do not define NOMINMAX as it's already defined in pre_args now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's a revert of fcd53bebe68 ("aco: Define NOMINMAX in Meson build file") Because 852d91edcd4 ("windows: Always set NOMINMAX to remove min/max macros") did the same thing Signed-off-by: Yonggang Luo Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build index 9e47b69f4db..d30ba1ea26e 100644 --- a/src/amd/compiler/meson.build +++ b/src/amd/compiler/meson.build @@ -82,7 +82,7 @@ libaco_files = files( 'aco_validate.cpp', ) -cpp_args_aco = cpp.get_supported_arguments(['-fno-exceptions', '-fno-rtti', '-Wimplicit-fallthrough', '-Wshadow', '-DNOMINMAX']) +cpp_args_aco = cpp.get_supported_arguments(['-fno-exceptions', '-fno-rtti', '-Wimplicit-fallthrough', '-Wshadow']) _libaco = static_library( 'aco',