diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-07-01 15:47:29 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 14:05:32 +0200 |
| commit | 58e548a0cc9e38a5aeacbbc5f1b915babc28761f (patch) | |
| tree | c06b8a3a2dfe7cb23cdb2ca98de6eed98f5bdbad /chromium/gpu/gpu.gyp | |
| parent | a2940819e78bee11fb21f54b5ab78cbb1e4d2b9f (diff) | |
<chromium> Use ANGLE libraries from the Qt build / installation.
This moves libEGL and libGLESv2 from dependencies to
libraries where needed.
This also adds support for using the correct configuration
of the ANGLE libraries for linking and runtime loading.
Change-Id: I8c3a5eb11517bf03e921b257eeb3a34b7bc841ea
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/gpu/gpu.gyp')
| -rw-r--r-- | chromium/gpu/gpu.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/gpu/gpu.gyp b/chromium/gpu/gpu.gyp index 01df691398c..b2f377d0a57 100644 --- a/chromium/gpu/gpu.gyp +++ b/chromium/gpu/gpu.gyp @@ -366,7 +366,7 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['OS == "win"', { + ['OS == "win" and use_qt==0', { 'dependencies': [ '../third_party/angle/src/build_angle.gyp:libEGL', '../third_party/angle/src/build_angle.gyp:libGLESv2', |