From 91d6d7fe890eec000cc189ec846e7ec9c79a0bd4 Mon Sep 17 00:00:00 2001 From: "thomasvl@chromium.org" Date: Thu, 19 Mar 2009 19:26:42 +0000 Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@12136 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 0da4cd398..0622dd4a6 100644 --- a/common.gypi +++ b/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': {