Re-enable Skia precompiled prefix header
Review URL: http://codereview.chromium.org/3005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2114 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
skia
@ -1041,10 +1041,10 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
|
baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
|
GCC_PREFIX_HEADER = skia_Prefix.pch;
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||||
"$(GCC_PREPROCESSOR_DEFINITIONS)",
|
"$(GCC_PREPROCESSOR_DEFINITIONS)",
|
||||||
SK_BUILD_FOR_MAC,
|
SK_BUILD_FOR_MAC,
|
||||||
SK_DEBUG,
|
|
||||||
);
|
);
|
||||||
HEADER_SEARCH_PATHS = (
|
HEADER_SEARCH_PATHS = (
|
||||||
corecg,
|
corecg,
|
||||||
@ -1061,6 +1061,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
|
baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
|
GCC_PREFIX_HEADER = skia_Prefix.pch;
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||||
"$(GCC_PREPROCESSOR_DEFINITIONS)",
|
"$(GCC_PREPROCESSOR_DEFINITIONS)",
|
||||||
SK_BUILD_FOR_MAC,
|
SK_BUILD_FOR_MAC,
|
||||||
|
@ -1,42 +1,12 @@
|
|||||||
// Copyright 2008, Google Inc.
|
// Copyright (c) 2008 The Chromium Authors. All rights reserved.
|
||||||
// All rights reserved.
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
//
|
// found in the LICENSE file.
|
||||||
// Redistribution and use in source and binary forms, with or without
|
|
||||||
// modification, are permitted provided that the following conditions are
|
|
||||||
// met:
|
|
||||||
//
|
|
||||||
// * Redistributions of source code must retain the above copyright
|
|
||||||
// notice, this list of conditions and the following disclaimer.
|
|
||||||
// * Redistributions in binary form must reproduce the above
|
|
||||||
// copyright notice, this list of conditions and the following disclaimer
|
|
||||||
// in the documentation and/or other materials provided with the
|
|
||||||
// distribution.
|
|
||||||
// * Neither the name of Google Inc. nor the names of its
|
|
||||||
// contributors may be used to endorse or promote products derived from
|
|
||||||
// this software without specific prior written permission.
|
|
||||||
//
|
|
||||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
// Copied from base/basictypes.h with some modifications
|
|
||||||
//
|
|
||||||
|
|
||||||
// Prefix header for all source files in the 'Skia' framework.
|
// Prefix header for all source files in the 'Skia' framework.
|
||||||
//
|
|
||||||
|
|
||||||
#ifdef __OBJC__
|
#ifdef __OBJC__
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SK_BUILD_FOR_MAC
|
// Include the Skia prefix file.
|
||||||
|
|
||||||
// include the Skia prefix file
|
|
||||||
#include "precompiled.cc"
|
#include "precompiled.cc"
|
||||||
|
Reference in New Issue
Block a user