diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 01:05:28 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 01:05:28 +0000 |
| commit | aca93f29bcb36a07157714ddf127d13fafc803a7 (patch) | |
| tree | 0bbd785a264e8303b4c5cf9e12449628783d0982 | |
| parent | b2936a488c205a22953cac658e768af13ce8b953 (diff) | |
| download | chromium_src-aca93f29bcb36a07157714ddf127d13fafc803a7.zip chromium_src-aca93f29bcb36a07157714ddf127d13fafc803a7.tar.gz chromium_src-aca93f29bcb36a07157714ddf127d13fafc803a7.tar.bz2 | |
Includes chrome_frame project in chrome.sln for windows.
BUG=None
TEST=rebuild gyp files, open chrome.sln. Observer chrome_frame project.
Review URL: http://codereview.chromium.org/271014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28362 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/all.gyp | 5 | ||||
| -rwxr-xr-x | chrome/chrome.gyp | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index 7895f51..7fbd745 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -44,6 +44,11 @@ '../v8/tools/gyp/v8.gyp:*', ], }], + ['chrome_frame_define==1', { + 'dependencies': [ + '../chrome_frame/chrome_frame.gyp:*', + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c26422f..4ec88a6 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3253,9 +3253,6 @@ 'app/hard_error_handler_win.h', 'app/scoped_ole_initializer.h', ], - 'dependencies': [ - '../build/util/support/support.gyp:*', - ], 'mac_bundle_resources': [ 'app/app-Info.plist', ], @@ -3269,6 +3266,11 @@ 'INFOPLIST_FILE': 'app/app-Info.plist', }, 'conditions': [ + ['chrome_frame_define==1 and OS=="win"', { + 'dependencies': [ + '../chrome_frame/chrome_frame.gyp:npchrome_tab', + ], + }], ['OS=="linux" or OS=="freebsd"', { 'actions': [ { @@ -5831,6 +5833,13 @@ '../tools/memory_watcher/memory_watcher.gyp:*', '../v8/tools/gyp/v8.gyp:v8_shell', ], + 'conditions': [ + ['chrome_frame_define==1', { + 'dependencies': [ + '../chrome_frame/chrome_frame.gyp:*', + ], + }], + ], }, { 'target_name': 'chrome_dll_version', |