[Windows] Move __REQUIRED_RPCNDR_H_VERSION__ to the header.
This commit is contained in:
parent
bc2d0e9f39
commit
a07f92a81c
2 changed files with 5 additions and 1 deletions
|
@ -136,7 +136,6 @@ if env.msvc:
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
extra_defines += [
|
extra_defines += [
|
||||||
("__REQUIRED_RPCNDR_H_VERSION__", 475),
|
|
||||||
"HAVE_STRUCT_TIMESPEC",
|
"HAVE_STRUCT_TIMESPEC",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,11 @@
|
||||||
#include "core/templates/self_list.h"
|
#include "core/templates/self_list.h"
|
||||||
#include "servers/rendering/rendering_device_driver.h"
|
#include "servers/rendering/rendering_device_driver.h"
|
||||||
|
|
||||||
|
#ifndef _MSC_VER
|
||||||
|
// Match current version used by MinGW, MSVC and Direct3D 12 headers use 500.
|
||||||
|
#define __REQUIRED_RPCNDR_H_VERSION__ 475
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__GNUC__) && !defined(__clang__)
|
#if defined(__GNUC__) && !defined(__clang__)
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||||
|
|
Loading…
Reference in a new issue