Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1581)

Unified Diff: chrome/chrome.gyp

Issue 271014: Includes chrome_frame project in chrome.sln for windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 28361)
+++ chrome/chrome.gyp (working copy)
@@ -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',
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698