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
48 lines
1.8 KiB
Diff
48 lines
1.8 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 -lsetupapi'
|
|
+ ]
|
|
},
|
|
],
|
|
}
|
|
--- 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
|
|
@@ -801,7 +803,7 @@
|
|
{
|
|
'target_name': 'libGLESv2',
|
|
'type': '<(angle_gl_library_type)',
|
|
- 'dependencies': [ 'libANGLE', 'angle_common' ],
|
|
+ 'dependencies': [ 'translator', 'libANGLE', 'angle_common' ],
|
|
'includes': [ '../gyp/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 -lsetupapi'
|
|
+ ]
|
|
},
|
|
],
|
|
}
|