summaryrefslogtreecommitdiff
path: root/chromium/content/content_gpu.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/content_gpu.gypi')
-rw-r--r--chromium/content/content_gpu.gypi11
1 files changed, 10 insertions, 1 deletions
diff --git a/chromium/content/content_gpu.gypi b/chromium/content/content_gpu.gypi
index 453fbecce80..342cba1016a 100644
--- a/chromium/content/content_gpu.gypi
+++ b/chromium/content/content_gpu.gypi
@@ -23,7 +23,7 @@
'..',
],
'conditions': [
- ['OS=="win"', {
+ ['OS=="win" and use_qt==0', {
'include_dirs': [
'<(DEPTH)/third_party/khronos',
'<(angle_path)/src',
@@ -39,6 +39,15 @@
],
},
}],
+ ['qt_os=="win32"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lsetupapi.lib',
+ '-l<(qt_egl_library)',
+ '-l<(qt_glesv2_library)',
+ ],
+ },
+ }],
['OS=="win" and target_arch=="ia32" and directxsdk_exists=="True"', {
# We don't support x64 prior to Win7 and D3DCompiler_43.dll is
# not needed on Vista+.