diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-28 00:50:08 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-28 00:50:08 +0000 |
| commit | 87fde4a19ca045af34cc2582b405449541b2b0ca (patch) | |
| tree | 7c82cf05fec6415610a5387adf21db547017d4b4 /chrome | |
| parent | f3e63f60ebf3f46bc92fe6238de3a6c56b2676a9 (diff) | |
| download | chromium_src-87fde4a19ca045af34cc2582b405449541b2b0ca.zip chromium_src-87fde4a19ca045af34cc2582b405449541b2b0ca.tar.gz chromium_src-87fde4a19ca045af34cc2582b405449541b2b0ca.tar.bz2 | |
Link applications with -Wl,-ObjC to keep Objective-C implementations available
Review URL: http://codereview.chromium.org/28289
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9258a95..3adc429 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1310,25 +1310,7 @@ 'browser', 'renderer', ], - 'variables': { - 'conditions': [ - ['OS=="mac"', { - 'mac_xib_files': [ - # Use .xib files only, because .nibs are bundles and these files - # need to be used as an input to rules. Rule dependency checking - # only works on files, not directories as .nib bundles are. - 'app/nibs/English.lproj/BrowserWindow.xib', - 'app/nibs/English.lproj/MainMenu.xib', - 'app/nibs/English.lproj/TabContents.xib', - ], - }, { # else: OS!="mac" - 'mac_xib_files': [], - }], - ], - }, 'sources': [ - '<@(mac_xib_files)', - # All .cc, .h, and .mm files under app except for tests. 'app/breakpad.cc', 'app/breakpad.h', @@ -1346,7 +1328,9 @@ 'app/scoped_ole_initializer.h', ], 'mac_bundle_resources': [ - '<@(mac_xib_files)', + 'app/nibs/English.lproj/BrowserWindow.xib', + 'app/nibs/English.lproj/MainMenu.xib', + 'app/nibs/English.lproj/TabContents.xib', 'app/theme/chromium/chromium.icns', 'app/theme/back.pdf', 'app/theme/forward.pdf', @@ -1372,20 +1356,6 @@ 'conditions': [ ['OS=="mac"', { 'product_name': 'Chromium', - 'rules': [ - { - 'rule_name': 'ib_classes', - 'extension': 'xib', - 'outputs': [ - '<(INTERMEDIATE_DIR)/ib_classes/<(RULE_INPUT_ROOT)IBClasses.mm', - ], - 'inputs': [ - '../build/mac/make_ib_classes.py', - ], - 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<(RULE_INPUT_PATH)'], - 'process_outputs_as_sources': 1, - }, - ], }], ['OS!="win"', { 'variables': { |