diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 19:26:42 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 19:26:42 +0000 |
| commit | d92c7c0152bc190c98c1a3174ceca6f08a5dcca6 (patch) | |
| tree | dc7a5b5685d99c40ec096d665df46be620b8d795 /build | |
| parent | c2fab8e13db79dd33b0324213c43cfcf8f68b9e9 (diff) | |
| download | chromium_src-d92c7c0152bc190c98c1a3174ceca6f08a5dcca6.zip chromium_src-d92c7c0152bc190c98c1a3174ceca6f08a5dcca6.tar.gz chromium_src-d92c7c0152bc190c98c1a3174ceca6f08a5dcca6.tar.bz2 | |
Chromium side of http://codereview.chromium.org/42394
- Remove the use of the mac specific type 'application' and use 'executable'
with 'mac_bundle' set to 1.
- update common.gypi to default mac_bundle to zero.
- update common.gypi to look at mac_bundle for some of the base behaviors that
were on 'application'.
- Roll DEPS to get the new version of gyp w/ the matching support.
Review URL: http://codereview.chromium.org/50015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0da4cd3..0622dd4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -89,6 +89,7 @@ 'conditions': [ ['OS=="mac"', { 'target_defaults': { + 'mac_bundle': 0, 'xcode_settings': { 'ALWAYS_SEARCH_USER_PATHS': 'NO', 'GCC_C_LANGUAGE_STANDARD': 'c99', @@ -117,10 +118,10 @@ ['_type!="static_library"', { 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, }], - ['_type=="application"', { + ['_type=="executable" and _mac_bundle', { 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, }], - ['_type=="application" or _type=="executable"', { + ['_type=="executable"', { 'postbuilds': [ { 'variables': { |