327982c190
* 1. Fix to build angleproject using newest git checkout by linking to -lsetupapi 2. Add small patch to build outside of the source directory 3. Build static libraries after building shared libraries * Update PKGBUILD * Update PKGBUILD * 1. modify spacing to be consistent * Update PKGBUILD * 1. windows file endings broke build * # Conflicts: # mingw-w64-angleproject-git/PKGBUILD * 462820ab00f0644c96f0d56925f89eca3a1fbf8bc2e033e13c41b971980b2a56 * 1. fix 32bit definitions * Update NSS to 3.20.2
83 lines
3.2 KiB
Diff
83 lines
3.2 KiB
Diff
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 <algorithm>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
+#include <intrin.h>
|
|
|
|
namespace gl
|
|
{
|
|
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/d3d11/renderer11_utils.h"
|
|
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
|
|
#include "third_party/murmurhash/MurmurHash3.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',
|
|
{
|