-
Notifications
You must be signed in to change notification settings - Fork 69
/
0003-fixes-for-mingw-gcc-12.patch
98 lines (84 loc) · 2.59 KB
/
0003-fixes-for-mingw-gcc-12.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
From 277ea7306703288c2453ddd767178f35a40b73b0 Mon Sep 17 00:00:00 2001
From: Gcenx <[email protected]>
Date: Tue, 17 May 2022 20:07:12 -0400
Subject: [PATCH 3/3] fixes for mingw-gcc-12
---
meson.build | 2 +-
src/d3d10/d3d10_multithread.cpp | 2 ++
src/d3d10/d3d10_reflection.h | 1 +
src/dxvk/dxvk_barrier.h | 2 ++
src/dxvk/dxvk_context.cpp | 2 ++
src/util/config/config.cpp | 1 +
src/vulkan/vulkan_util.h | 2 ++
7 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index a33bebe9..2f5e6d1b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('dxvk', ['c', 'cpp'], version : 'v1.7', meson_version : '>= 0.46')
+project('dxvk', ['c', 'cpp'], version : 'v1.7', meson_version : '>= 0.46', default_options : [ 'cpp_std=c++17' ])
cpu_family = target_machine.cpu_family()
diff --git a/src/d3d10/d3d10_multithread.cpp b/src/d3d10/d3d10_multithread.cpp
index f38a8081..43bd5c1d 100644
--- a/src/d3d10/d3d10_multithread.cpp
+++ b/src/d3d10/d3d10_multithread.cpp
@@ -1,3 +1,5 @@
+#include <utility>
+
#include "d3d10_device.h"
namespace dxvk {
diff --git a/src/d3d10/d3d10_reflection.h b/src/d3d10/d3d10_reflection.h
index b25a92ce..10100939 100644
--- a/src/d3d10/d3d10_reflection.h
+++ b/src/d3d10/d3d10_reflection.h
@@ -4,6 +4,7 @@
#include <vector>
#include "d3d10_include.h"
+#include <memory>
#include <d3d10shader.h>
#include <d3d11shader.h>
diff --git a/src/dxvk/dxvk_barrier.h b/src/dxvk/dxvk_barrier.h
index e97669c6..64dcb2cd 100644
--- a/src/dxvk/dxvk_barrier.h
+++ b/src/dxvk/dxvk_barrier.h
@@ -1,5 +1,7 @@
#pragma once
+#include <utility>
+
#include "dxvk_buffer.h"
#include "dxvk_cmdlist.h"
#include "dxvk_image.h"
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 10db8ae6..93c845cd 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -1,5 +1,7 @@
#include <cstring>
+#include <utility>
+
#include "dxvk_device.h"
#include "dxvk_context.h"
#include "dxvk_main.h"
diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp
index 84714a3e..904097ba 100644
--- a/src/util/config/config.cpp
+++ b/src/util/config/config.cpp
@@ -2,6 +2,7 @@
#include <sstream>
#include <iostream>
#include <regex>
+#include <utility>
#include "config.h"
diff --git a/src/vulkan/vulkan_util.h b/src/vulkan/vulkan_util.h
index 97108ea6..dd416d55 100644
--- a/src/vulkan/vulkan_util.h
+++ b/src/vulkan/vulkan_util.h
@@ -1,5 +1,7 @@
#pragma once
+#include <utility>
+
#include "vulkan_loader.h"
namespace dxvk::vk {
--
2.32.0 (Apple Git-132)