46 lines
2.6 KiB
Diff
46 lines
2.6 KiB
Diff
--- src.orig/libEGL.gypi 2014-01-11 12:17:37.971020837 +0100
|
|
+++ src/libEGL.gypi 2014-01-11 12:20:05.406870084 +0100
|
|
@@ -13,6 +13,14 @@
|
|
'target_name': 'libEGL',
|
|
'type': 'shared_library',
|
|
'dependencies': [ 'libGLESv2' ],
|
|
+ 'conditions': [
|
|
+ ['TARGET=="win32" and GENERATOR == "make"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL_mingw32.def -Wl,--whole-archive -L. -lGLESv2 -ld3d9 -ldxguid -Wl,--no-whole-archive' ],
|
|
+ }],
|
|
+ ['TARGET=="win64" and GENERATOR == "make"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL.def -Wl,--whole-archive -L. -lGLESv2 -ld3d9 -ldxguid -Wl,--no-whole-archive' ],
|
|
+ }],
|
|
+ ],
|
|
'include_dirs':
|
|
[
|
|
'.',
|
|
--- src.orig/libGLESv2.gypi 2014-01-11 12:17:37.971020837 +0100
|
|
+++ src/libGLESv2.gypi 2014-01-11 12:19:22.916166993 +0100
|
|
@@ -23,6 +23,14 @@
|
|
'target_name': 'libGLESv2',
|
|
'type': 'shared_library',
|
|
'dependencies': [ 'translator', 'copy_compiler_dll' ],
|
|
+ 'conditions': [
|
|
+ ['TARGET=="win32" and GENERATOR == "make"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2_mingw32.def -Wl,--whole-archive -ld3d9 -ldxguid -Wl,--no-whole-archive' ],
|
|
+ }],
|
|
+ ['TARGET=="win64" and GENERATOR == "make"', {
|
|
+ 'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2.def -Wl,--whole-archive -ld3d9 -ldxguid -Wl,--no-whole-archive' ],
|
|
+ }],
|
|
+ ],
|
|
'include_dirs':
|
|
[
|
|
'.',
|
|
--- src.orig/angle.gypi 2014-01-11 12:28:41.414124056 +0100
|
|
+++ src/angle.gypi 2014-01-11 12:31:06.065777743 +0100
|
|
@@ -38,7 +38,7 @@
|
|
'message': 'Copying D3D Compiler DLL...',
|
|
'inputs': [ 'copy_compiler_dll.bat' ],
|
|
'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
|
|
- 'action': ["<(angle_relative_src_path)copy_compiler_dll.bat", "$(PlatformName)", "<(windows_sdk_path)", "<(PRODUCT_DIR)" ],
|
|
+ 'action': ["touch", '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
|
|
}
|
|
] #actions
|
|
},
|