Martchus
519b186e0d
- patched ANGLE to be usable with Qt WebKit - patched Qt WebKit to work with latest ANGLE - removed unused patches - fixed dependencies of mingw-w64-qt5-activeqt
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
--- 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_requires_importlibrary' : 'true',
|
|
}],
|
|
+ ['TARGET=="win32"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL_mingw32.def' ],
|
|
+ }],
|
|
+ ['TARGET=="win64"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL.def' ],
|
|
+ }],
|
|
],
|
|
+ 'libraries': [
|
|
+ '-ldxguid -ld3d9 -lgdi32'
|
|
+ ]
|
|
},
|
|
],
|
|
}
|
|
--- 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',
|
|
}],
|
|
+ ['TARGET=="win32"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2_mingw32.def' ],
|
|
+ }],
|
|
+ ['TARGET=="win64"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2.def' ],
|
|
+ }],
|
|
],
|
|
+ 'libraries': [
|
|
+ '-ldxguid -ld3d9 -lgdi32'
|
|
+ ]
|
|
},
|
|
],
|
|
}
|