diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-10 11:41:29 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-10 11:42:50 +0200 |
| commit | d572ab1bb446e880fcb8d27294ba8149550f1659 (patch) | |
| tree | d29c449b551e47569c6d9f146ba9e86810c05353 /src/3rdparty/angle/src/common/platform.h | |
| parent | 211cef46f6d9d8738c09f906f9c0c3080b445dc8 (diff) | |
| parent | 71df09b6cca7cd7a673bf39f49d0dda28b78a860 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Id4997327cc01bd4bb397a463bdffbd15e80398ef
Diffstat (limited to 'src/3rdparty/angle/src/common/platform.h')
| -rw-r--r-- | src/3rdparty/angle/src/common/platform.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/common/platform.h b/src/3rdparty/angle/src/common/platform.h index cedc6f2f22..44c5c7c03b 100644 --- a/src/3rdparty/angle/src/common/platform.h +++ b/src/3rdparty/angle/src/common/platform.h @@ -59,8 +59,10 @@ # include <d3d10.h> # include <d3d11.h> # include <dxgi.h> +# if _MSC_VER >= 1700 # include <dxgi1_2.h> # include <d3dcompiler.h> +# endif # endif # undef near |