diff options
Diffstat (limited to 'src/angle/patches/0006-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch')
| -rw-r--r-- | src/angle/patches/0006-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/angle/patches/0006-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch b/src/angle/patches/0006-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch index cf31245b95..df057c01ee 100644 --- a/src/angle/patches/0006-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch +++ b/src/angle/patches/0006-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch @@ -1,7 +1,7 @@ -From 68ba96d224a84389567f506661a78c32b307e84d Mon Sep 17 00:00:00 2001 +From 7609185310c081cbe396c993ccc84f2c43674281 Mon Sep 17 00:00:00 2001 From: Kai Koehne <kai.koehne@digia.com> -Date: Tue, 18 Feb 2014 10:29:14 +0200 -Subject: [PATCH] Fix compilation of libGLESv2 with older MinGW-w64 +Date: Sat, 28 Jun 2014 17:11:04 +0300 +Subject: [PATCH 06/12] Fix compilation of libGLESv2 with older MinGW-w64 headers Fix compilation of libGLESv2 for mingw-headers predating MinGW-w64 @@ -15,20 +15,18 @@ MinGW-builds gcc 4.7.2-rev11) will unfortunately remain broken. Change-Id: I31272a1a991c4fc0f1611f8fb7510be51d6bb925 --- - .../angle/src/libGLESv2/renderer/Renderer.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + .../angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) -diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp -index 3407353..e74120d 100644 ---- a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp -+++ b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp -@@ -24,6 +24,25 @@ - #define D3DERR_OUTOFVIDEOMEMORY MAKE_HRESULT(1, 0x876, 380) - #endif +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp +index 499ed52..1df6a5e 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp +@@ -9,6 +9,21 @@ -+#ifdef __MINGW32__ -+ -+#ifndef D3DCOMPILER_DLL + #include <d3dcompiler.h> + ++#if defined(__MINGW32__) && !defined(D3DCOMPILER_DLL) + +// Add define + typedefs for older MinGW-w64 headers (pre 5783) + @@ -41,13 +39,11 @@ index 3407353..e74120d 100644 + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); + -+#endif // D3DCOMPILER_DLL -+ -+#endif // __MINGW32__ ++#endif // __MINGW32__ && !D3DCOMPILER_DLL + namespace rx { -- -1.8.4.msysgit.0 +1.9.0.msysgit.0 |