summarylogtreecommitdiffstats
path: root/angleproject-include-import-library-and-use-def-file.patch
diff options
context:
space:
mode:
Diffstat (limited to 'angleproject-include-import-library-and-use-def-file.patch')
-rw-r--r--angleproject-include-import-library-and-use-def-file.patch42
1 files changed, 35 insertions, 7 deletions
diff --git a/angleproject-include-import-library-and-use-def-file.patch b/angleproject-include-import-library-and-use-def-file.patch
index 342ba0b66577..24abf44850be 100644
--- a/angleproject-include-import-library-and-use-def-file.patch
+++ b/angleproject-include-import-library-and-use-def-file.patch
@@ -1,8 +1,8 @@
---- angleproject/src/libEGL.gypi.orig 2015-07-10 11:42:08.230786800 +0300
-+++ angleproject/src/libEGL.gypi 2015-07-10 11:44:01.168491900 +0300
-@@ -48,7 +48,16 @@
+--- angleproject/src/libEGL.gypi.orig 2016-03-09 22:11:16.726879140 +0100
++++ angleproject/src/libEGL.gypi 2016-03-10 00:44:46.815748629 +0100
+@@ -38,7 +38,16 @@
{
- 'msvs_enable_winphone' : '1',
+ 'msvs_requires_importlibrary' : 'true',
}],
+ ['TARGET=="win32"', {
+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL_mingw32.def' ],
@@ -17,9 +17,37 @@
},
],
}
---- angleproject/src/libGLESv2.gypi.orig 2015-07-10 11:41:58.223787600 +0300
-+++ angleproject/src/libGLESv2.gypi 2015-07-10 11:44:36.585949800 +0300
-@@ -826,7 +826,16 @@
+ --- angleproject/src/libGLESv2.gypi.orig 2016-03-10 03:55:05.562030615 +0100
++++ angleproject/src/libGLESv2.gypi 2016-03-10 03:54:50.675783990 +0100
+@@ -515,6 +514,9 @@
+ 'libGLESv2/libGLESv2.def',
+ 'libGLESv2/libGLESv2.rc',
+ 'libGLESv2/resource.h',
++ '../include/GLSLANG/ShaderLang.h',
++ '../include/GLSLANG/ShaderVars.h',
++ 'libGLESv2/entry_points_shader.cpp'
+ ],
+ 'libegl_sources':
+ [
+@@ -533,7 +535,7 @@
+ 'type': 'static_library',
+ 'dependencies':
+ [
+- 'translator_static',
++ 'translator_lib',
+ 'commit_id',
+ 'angle_common',
+ ],
+@@ -801,7 +803,7 @@
+ {
+ 'target_name': 'libGLESv2',
+ 'type': '<(angle_gl_library_type)',
+- 'dependencies': [ 'libANGLE', 'angle_common' ],
++ 'dependencies': [ 'translator_lib', 'libANGLE', 'angle_common' ],
+ 'includes': [ '../build/common_defines.gypi', ],
+ 'sources':
+ [
+@@ -821,7 +823,16 @@
{
'msvs_enable_winphone' : '1',
}],