From f8c9260f34a924bfafc932ee7573c1318babf22e Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
<tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 1 Nov 2013 15:22:41 +0000
Subject: Remove unnecessary dependencies on "ui" target from some other
targets.
BUG=302505
TEST=None, targets built.
R=dalecurtis@chromium.org,thestig@chromium.org,ben@chromium.org
Review URL: https://codereview.chromium.org/48213004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232399 0039d316-1c4b-4281-b951-d872f2087c98
---
ui/compositor/compositor.gyp | 1 -
ui/gl/gl.gyp | 16 +++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
(limited to 'ui')
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 2da4195..c2afadc 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -19,7 +19,6 @@
'<(DEPTH)/ui/events/events.gyp:events',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl',
- '<(DEPTH)/ui/ui.gyp:ui',
],
'defines': [
'COMPOSITOR_IMPLEMENTATION',
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 1b58ef9..28cbaa3 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -19,7 +19,6 @@
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
- '<(DEPTH)/ui/ui.gyp:ui',
],
'variables': {
'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
@@ -235,6 +234,21 @@
'<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
'<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'dwmapi.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'dwmapi.lib',
+ ],
+ },
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-ldwmapi.lib',
+ ],
+ },
}],
['OS=="mac"', {
'sources': [
--
cgit v1.1