forked from git-for-windows/MINGW-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path0000-build-fix.patch
83 lines (80 loc) · 3.27 KB
/
0000-build-fix.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
diff --git a/src/angle.gyp b/src/angle.gyp
index 4095547..3db4840 100644
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -76,7 +76,7 @@
[
{
'destination': '<(angle_gen_path)',
- 'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ],
+ 'files': [ '<(angle_id_script_base)' ],
},
],
'conditions':
@@ -206,10 +206,10 @@
'outputs': [ '<(PRODUCT_DIR)/d3dcompiler_47.dll' ],
'action':
[
- "<(angle_gen_path)/copy_compiler_dll.bat",
- "$(PlatformName)",
- "<(windows_sdk_path)",
- "<(PRODUCT_DIR)"
+# "<(angle_gen_path)/copy_compiler_dll.bat",
+# "$(PlatformName)",
+# "<(windows_sdk_path)",
+# "<(PRODUCT_DIR)"
],
},
], #actions
diff --git a/src/common/mathutil.h b/src/common/mathutil.h
index e096b1a..716aeb6 100644
--- a/src/common/mathutil.h
+++ b/src/common/mathutil.h
@@ -16,6 +16,7 @@
#include <string.h>
#include <algorithm>
#include <limits>
+#include <intrin.h>
#include <anglebase/numerics/safe_math.h>
diff --git a/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp b/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
index ae42f36..0f1fed8 100644
--- a/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
@@ -16,6 +16,7 @@
#include "libANGLE/renderer/d3d/FramebufferD3D.h"
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
+#include <float.h>
namespace rx
{
diff --git a/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h b/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
index c4b79ee..f22609b 100644
--- a/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
+++ b/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
@@ -23,7 +23,7 @@ typedef HGLRC(WINAPI *PFNWGLCREATELAYERCONTEXTPROC)(HDC, int);
typedef BOOL(WINAPI *PFNWGLDELETECONTEXTPROC)(HGLRC);
typedef HGLRC(WINAPI *PFNWGLGETCURRENTCONTEXTPROC)(VOID);
typedef HDC(WINAPI *PFNWGLGETCURRENTDCPROC)(VOID);
-typedef PROC(WINAPI *PFNWGLGETPROCADDRESSPROC)(LPCSTR);
+typedef void*(WINAPI *PFNWGLGETPROCADDRESSPROC)(LPCSTR);
typedef BOOL(WINAPI *PFNWGLMAKECURRENTPROC)(HDC, HGLRC);
typedef BOOL(WINAPI *PFNWGLSHARELISTSPROC)(HGLRC, HGLRC);
typedef BOOL(WINAPI *PFNWGLUSEFONTBITMAPSAPROC)(HDC, DWORD, DWORD, DWORD);
diff --git a/util/util.gyp b/util/util.gyp
index bda8a0530..2a87e57e7 100644
--- a/util/util.gyp
+++ b/util/util.gyp
@@ -118,6 +118,13 @@
[
'<@(util_win32_sources)',
],
+ 'link_settings':
+ {
+ 'libraries':
+ [
+ '-lgdi32',
+ ]
+ },
}],
['OS=="win" and angle_build_winrt==1',
{