summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-12 17:45:11 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-12 17:45:11 +0000
commite265a5c7b144b7eb3f0bfe4750238d115775e66e (patch)
tree9de1ca4cea2a433c904c677d1e93687af5a1400e /chrome
parent4229df0648672396560a7ded41927048ec20f1e2 (diff)
downloadchromium_src-e265a5c7b144b7eb3f0bfe4750238d115775e66e.zip
chromium_src-e265a5c7b144b7eb3f0bfe4750238d115775e66e.tar.gz
chromium_src-e265a5c7b144b7eb3f0bfe4750238d115775e66e.tar.bz2
chrome.gyp updates for recent changes:
* 'app_base' needs dependencies on 'chrome_{resources,strings}' (for the generated_resources.h include directory). * 'app_base' needs third_party/wtl/include (for atlapp.h). * drag_utils.{cc,h} is now in ../views. Review URL: http://codereview.chromium.org/115242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 79d9be2..ee8e41e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -154,6 +154,8 @@
'type': '<(library)',
'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',
'dependencies': [
+ 'chrome_resources',
+ 'chrome_strings',
'../base/base.gyp:base',
'../base/base.gyp:base_gfx',
'../net/net.gyp:net',
@@ -163,6 +165,7 @@
],
'include_dirs': [
'..',
+ 'third_party/wtl/include',
],
'sources': [
# All .cc, .h, and .mm files under app/ except for tests.
@@ -3190,6 +3193,8 @@
'../views/controls/tree/tree_node_model.h',
'../views/controls/tree/tree_view.cc',
'../views/controls/tree/tree_view.h',
+ '../views/drag_utils.cc',
+ '../views/drag_utils.h',
'../views/event.cc',
'../views/event.h',
'../views/event_gtk.cc',
@@ -3310,7 +3315,12 @@
'include_dirs': [
'third_party/wtl/include',
],
- },],
+ }, { # OS != "win"
+ 'sources!': [
+ '../views/drag_utils.cc',
+ '../views/drag_utils.h',
+ ],
+ }],
['OS=="linux"', {
'sources!': [
'../views/accelerator.cc',