diff options
| author | driver1998 <driver1998@foxmail.com> | 2020-01-23 05:06:38 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-22 13:06:38 -0800 |
| commit | c97c23ce0a60e20c735d58752b078a343c20970b (patch) | |
| tree | 06116540e0549eb873bfb74a221c13ea8bc9787f /ports/angle/002-fix-builder-error.patch | |
| parent | 6ee24347559320ab4556ec1899319b61fa85c247 (diff) | |
| download | vcpkg-c97c23ce0a60e20c735d58752b078a343c20970b.tar.gz vcpkg-c97c23ce0a60e20c735d58752b078a343c20970b.zip | |
[angle] Update to 2019-12-31 (#9557)
* [angle] Update to 2019-12-31
* [angle] install *.inc files
Diffstat (limited to 'ports/angle/002-fix-builder-error.patch')
| -rw-r--r-- | ports/angle/002-fix-builder-error.patch | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/ports/angle/002-fix-builder-error.patch b/ports/angle/002-fix-builder-error.patch index db70f9fdc..8c632d1b0 100644 --- a/ports/angle/002-fix-builder-error.patch +++ b/ports/angle/002-fix-builder-error.patch @@ -1,30 +1,28 @@ diff --git a/src/gpu_info_util/SystemInfo_win.cpp b/src/gpu_info_util/SystemInfo_win.cpp -index 878f0f5..2255982 100644 +index f4bb137f2..86495013b 100644 --- a/src/gpu_info_util/SystemInfo_win.cpp +++ b/src/gpu_info_util/SystemInfo_win.cpp -@@ -4,6 +4,12 @@ - // found in the LICENSE file. - // +@@ -6,11 +6,6 @@ -+// Windows.h needs to be included first -+#include <windows.h> -+ -+#include <d3d10.h> -+#include <dxgi.h> -+ // SystemInfo_win.cpp: implementation of the Windows-specific parts of SystemInfo.h - #include "gpu_info_util/SystemInfo_internal.h" -@@ -11,12 +17,6 @@ - #include "common/debug.h" - #include "common/string_utils.h" - --// Windows.h needs to be included first --#include <windows.h> +-#include "gpu_info_util/SystemInfo_internal.h" - --#include <d3d10.h> --#include <dxgi.h> +-#include "common/debug.h" +-#include "common/string_utils.h" - + // Windows.h needs to be included first + #include <windows.h> + +@@ -19,6 +14,11 @@ #include <array> #include <sstream> ++#include "gpu_info_util/SystemInfo_internal.h" ++ ++#include "common/debug.h" ++#include "common/string_utils.h" ++ + namespace angle + { + |