diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 22:42:59 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 22:42:59 +0000 |
| commit | 9543af0553bba7adab97d3a8a358510449dc2e60 (patch) | |
| tree | 3eccebdd899ce50369f42b99a46cd04197664ed9 /build | |
| parent | a52225ef714d58b30cf87e794f0082a1445b6626 (diff) | |
| download | chromium_src-9543af0553bba7adab97d3a8a358510449dc2e60.zip chromium_src-9543af0553bba7adab97d3a8a358510449dc2e60.tar.gz chromium_src-9543af0553bba7adab97d3a8a358510449dc2e60.tar.bz2 | |
Changes needed for MacOS X 10.4 support.
Add "support_macosx_10_4" option to common.gypi that causes it to change deployment target, and define a new preprocessor symbol on the Mac build. Setting this flag to true is harmless on non Mac builds and has no effect.
Make various changes to source files where they modify their behavior in the presence of the new preprocessor symbol to become 10.4 compatible.
Review URL: http://codereview.chromium.org/201122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7b8ad12..757c8c5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -52,6 +52,16 @@ # Linux-Mac cross compiler distcc farm. 'chromium_mac_pch%': 1, + # We normally expect MacOS X 10.5 at runtime in the product generated. + # Set to 1 to enable MacOS X 10.4 support where possible. + # Harmless to set on other platforms, as it has no effect. + # This is designed so that products such as O3D can use some Chrome source + # without losing 10.4 support. + # Look for support_macosx_10_4 later in the file to see where it turns on + # compile flags, defines SUPPORT_MACOSX_10_4 in the C preprocessor, + # and changes the Xcode deployment target setting. + 'support_macosx_10_4%': 0, + # Set to 1 to enable code coverage. In addition to build changes # (e.g. extra CFLAGS), also creates a new target in the src/chrome # project file called "coverage". @@ -611,7 +621,17 @@ 'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'], 'conditions': [ ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'}, - {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}], + {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'} + ], + ['support_macosx_10_4', + { + 'OTHER_CFLAGS': ['-D', 'SUPPORT_MACOSX_10_4',], + 'MACOSX_DEPLOYMENT_TARGET': '10.4', # mmacosx-version-min=10.4 + }, + { + 'MACOSX_DEPLOYMENT_TARGET': '10.5', # mmacosx-version-min=10.5 + } + ], ], }, 'target_conditions': [ |