diff options
Diffstat (limited to 'chromium/ui/compositor/compositor.gyp')
| -rw-r--r-- | chromium/ui/compositor/compositor.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chromium/ui/compositor/compositor.gyp b/chromium/ui/compositor/compositor.gyp index 405b46d7ce9..d34ac2cb870 100644 --- a/chromium/ui/compositor/compositor.gyp +++ b/chromium/ui/compositor/compositor.gyp @@ -58,7 +58,7 @@ 'transform_animation_curve_adapter.h', ], 'conditions': [ - ['OS == "win" and use_aura == 1', { + ['OS == "win" and use_aura == 1 and use_qt==0', { # TODO(sky): before we make this real need to remove # IDR_BITMAP_BRUSH_IMAGE. 'dependencies': [ @@ -67,6 +67,12 @@ '<(angle_path)/src/build_angle.gyp:libGLESv2', ], }], + ['use_aura == 1 and qt_os=="win32"', { + 'libraries': [ + '-l<(qt_egl_library)', + '-l<(qt_glesv2_library)', + ], + }], ], }, { |