diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 18:10:26 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 18:10:26 +0000 |
| commit | e969e9313609a6ad2d64e8605a6f5b3d43cf53a3 (patch) | |
| tree | b779bcec20c8d99d8003f1ac89896e8c9be1a17c /webkit/build | |
| parent | 2f9f2bda98274baa5af7d2231a84cca0970f462c (diff) | |
| download | chromium_src-e969e9313609a6ad2d64e8605a6f5b3d43cf53a3.zip chromium_src-e969e9313609a6ad2d64e8605a6f5b3d43cf53a3.tar.gz chromium_src-e969e9313609a6ad2d64e8605a6f5b3d43cf53a3.tar.bz2 | |
Eliminate using_webkit.{scons,vsprops} in favor of having WebCommon.h set the
default configuration. This simplifies the build system.
My concern was that some consumers of the API might mix-up the defines.
R=dglazkov
Review URL: http://codereview.chromium.org/42392
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebKit/WebKit.vsprops | 2 | ||||
| -rw-r--r-- | webkit/build/WebKit/using_WebKit.vsprops | 13 | ||||
| -rw-r--r-- | webkit/build/WebKit/using_webkit.scons | 21 |
3 files changed, 1 insertions, 35 deletions
diff --git a/webkit/build/WebKit/WebKit.vsprops b/webkit/build/WebKit/WebKit.vsprops index 03d48a3..905211e 100644 --- a/webkit/build/WebKit/WebKit.vsprops +++ b/webkit/build/WebKit/WebKit.vsprops @@ -8,7 +8,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public\win" - PreprocessorDefinitions="WEBKIT_IMPLEMENTATION;WEBKIT_USING_SKIA=1;_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1" + PreprocessorDefinitions="WEBKIT_IMPLEMENTATION;_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1" WarnAsError="true" /> </VisualStudioPropertySheet> diff --git a/webkit/build/WebKit/using_WebKit.vsprops b/webkit/build/WebKit/using_WebKit.vsprops deleted file mode 100644 index 28e1b79..0000000 --- a/webkit/build/WebKit/using_WebKit.vsprops +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="using_WebKit" - InheritedPropertySheets="$(SolutionDir)..\skia\using_skia.vsprops" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WEBKIT_USING_SKIA=1" - WarnAsError="true" - /> -</VisualStudioPropertySheet> diff --git a/webkit/build/WebKit/using_webkit.scons b/webkit/build/WebKit/using_webkit.scons deleted file mode 100644 index 6584790..0000000 --- a/webkit/build/WebKit/using_webkit.scons +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this -# source code is governed by a BSD-style license that can be found in the -# LICENSE file. - -__doc__ = """ -Settings for other components using the WebKit library. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'WEBKIT_USING_SKIA' - ], - CPPPATH = [ - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public' - ], - LIBS = [ - 'WebKit', - ], -) |