diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
| commit | 012adff3836f208288c09323c0de2f93117c13c9 (patch) | |
| tree | d1af9d7e64632c7b79a774015cc0377f0801010c /webkit/SConscript | |
| parent | 5ab78644f9d8237553aab6c0b6b97463ecd67bda (diff) | |
| download | chromium_src-012adff3836f208288c09323c0de2f93117c13c9.zip chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.gz chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.bz2 | |
Rolling back CL 3578, discovered hammer.bat had not been updated yet.
Review URL: http://codereview.chromium.org/7507
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 3ea66af..519e809 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -81,9 +81,7 @@ env.Prepend( '$ZLIB_DIR', '$LIBPNG_DIR', '$LIBJPEG_DIR', - '$LIBXSLT_DIR/scons', '$LIBXSLT_DIR', - '$LIBXML_DIR/scons/include', '$LIBXML_DIR/include', '$LIBXML_DIR/DerivedSources/include', '$ICU38_DIR/public/common', @@ -93,8 +91,8 @@ env.Prepend( '$SKIA_DIR/platform', '$NPAPI_DIR', '$V8_DIR/include', - '$DERIVED_DIR', - '$SHARED_DIR', + '$WEBKIT_DIR/V8Bindings/DerivedSources', + '$WEBKIT_DIR/V8Bindings/SharedSources', '$WEBKIT_DIR/port/bindings/v8', '$WEBKIT_DIR/WebCore', '$WEBKIT_DIR/WebCore/JavaScriptHeaders', @@ -146,13 +144,10 @@ env.Prepend( '$WEBKIT_DIR/port/svg/animation', '$WEBKIT_DIR/port/svg/graphics/filters', - '$ROOT_DIR', + '#/..', ], ) -if env.Bit('windows'): - env.Append(CPPPATH = ['$WEBKIT_DIR/port/page/win']) - env.Append( WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore", PENDING_DIR = "$WEBKIT_DIR/pending", @@ -164,8 +159,8 @@ env.Append( PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings", - DERIVED_DIR = "$WEBKIT_DIR/V8Bindings/DerivedSources", - SHARED_DIR = "$WEBKIT_DIR/V8Bindings/SharedSources", + DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), + SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), # This is a stop gap to get linux building in time for the webkit # merge. The true fix is to move the above CPPPATH prepend under this @@ -285,3 +280,4 @@ version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', '#/../webkit/build/webkit_version.py'], "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") env.AlwaysBuild(version) + |