diff options
| author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 23:03:26 +0000 |
|---|---|---|
| committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 23:03:26 +0000 |
| commit | fcf337e98b9f055a6b48e6eb3bbb616218f4e3b5 (patch) | |
| tree | 0dc4ca05fe233c25a3b9b37d60e958a54bc65f47 /skia | |
| parent | 7c091439547c08d87bf876171e37e9437d2ae2c3 (diff) | |
| download | chromium_src-fcf337e98b9f055a6b48e6eb3bbb616218f4e3b5.zip chromium_src-fcf337e98b9f055a6b48e6eb3bbb616218f4e3b5.tar.gz chromium_src-fcf337e98b9f055a6b48e6eb3bbb616218f4e3b5.tar.bz2 | |
Don't enable -Werror in Skia, it can't handle it (-Wunused even after my fixes, which I've upstreamed but not committed here). Turn on SK_DEBUG in the debug build, and turn off the precompiled header, because it's not getting the same macros set as the rest of the build, and SK_DEBUG winds up a mismatch.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.xcodeproj/project.pbxproj | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/skia/skia.xcodeproj/project.pbxproj b/skia/skia.xcodeproj/project.pbxproj index 75a9ee6a..fa38e29 100644 --- a/skia/skia.xcodeproj/project.pbxproj +++ b/skia/skia.xcodeproj/project.pbxproj @@ -1023,6 +1023,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B4DF44A0E5B5E5C004D7619 /* debug.xcconfig */; buildSettings = { + GCC_TREAT_WARNINGS_AS_ERRORS = NO; XCODEPROJ_DEPTH = ..; }; name = Debug; @@ -1031,6 +1032,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B4DF44C0E5B5E5C004D7619 /* release.xcconfig */; buildSettings = { + GCC_TREAT_WARNINGS_AS_ERRORS = NO; XCODEPROJ_DEPTH = ..; }; name = Release; @@ -1039,7 +1041,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */; buildSettings = { - GCC_PREFIX_HEADER = skia_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + SK_BUILD_FOR_MAC, + SK_DEBUG, + ); HEADER_SEARCH_PATHS = ( corecg, include, @@ -1055,7 +1061,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */; buildSettings = { - GCC_PREFIX_HEADER = skia_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + SK_BUILD_FOR_MAC, + ); HEADER_SEARCH_PATHS = ( corecg, include, |