Mesa (master): aco: Define NOMINMAX in Meson build file

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Dec 1 11:23:20 UTC 2020


Module: Mesa
Branch: master
Commit: fcd53bebe680f4171ee4b08669543da0c1243e76
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcd53bebe680f4171ee4b08669543da0c1243e76

Author: James Park <jpark37 at lagfreegames.com>
Date:   Thu Nov 26 21:29:13 2020 -0800

aco: Define NOMINMAX in Meson build file

Fix conflicts between std::min/max and Win32 min/max.

Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7785>

---

 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 0bd35cb424e..163747c4943 100644
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@@ -86,7 +86,7 @@ libaco_files = files(
   'aco_validate.cpp',
 )
 
-cpp_args_aco = cpp.get_supported_arguments(['-fno-exceptions', '-fno-rtti', '-Wshadow'])
+cpp_args_aco = cpp.get_supported_arguments(['-fno-exceptions', '-fno-rtti', '-Wshadow', '-DNOMINMAX'])
 
 _libaco = static_library(
   'aco',



More information about the mesa-commit mailing list