diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
| commit | 6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch) | |
| tree | 0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /ports/angle/002-fix-builder-error.patch | |
| parent | d502f061bb3ee0258d6453acbf258b9e5d93d564 (diff) | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
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 + { + |