OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows: Always set NOMINMAX to remove min/max macros

Browse Source 
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7680>
This commit is contained in:
Jesse Natalie
2020-11-18 18:14:41 -08:00
parent 0a7abee60b
commit 852d91edcd
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@@ -988,6 +988,7 @@ elif host_machine.system() == 'windows'
'-D_SCL_SECURE_NO_DEPRECATE', '-D_SCL_SECURE_NO_DEPRECATE',
'-D_ALLOW_KEYWORD_MACROS', '-D_ALLOW_KEYWORD_MACROS',
'-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions '-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions
'-DNOMINMAX',
] ]
else else
pre_args += ['-D__MSVCRT_VERSION__=0x0700'] pre_args += ['-D__MSVCRT_VERSION__=0x0700']

2
src/gallium/drivers/swr/rasterizer/common/os.h
View File

@@ -39,7 +39,9 @@
#undef NOMINMAX #undef NOMINMAX
#define UNICODE #define UNICODE
#else #else
#undef UNICODE
#include <windows.h> #include <windows.h>
#define UNICODE
#endif #endif
#include <intrin.h> #include <intrin.h>
#include <cstdint> #include <cstdint>