diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-17 23:44:26 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-17 23:44:26 +0000 |
| commit | dfcec23417f5ac504a257f1c740404df69826792 (patch) | |
| tree | 2939b84952c63d2de47d2aaeaa4d469ab17cef79 /webkit/SConscript | |
| parent | 63c2f1af4de7286e8f8b19f4921870a00fae64df (diff) | |
| download | chromium_src-dfcec23417f5ac504a257f1c740404df69826792.zip chromium_src-dfcec23417f5ac504a257f1c740404df69826792.tar.gz chromium_src-dfcec23417f5ac504a257f1c740404df69826792.tar.bz2 | |
Applying software construction toolkit patterns in scons build.
Review URL: http://codereview.chromium.org/6569
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 519e809..3ea66af 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -81,7 +81,9 @@ 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', @@ -91,8 +93,8 @@ env.Prepend( '$SKIA_DIR/platform', '$NPAPI_DIR', '$V8_DIR/include', - '$WEBKIT_DIR/V8Bindings/DerivedSources', - '$WEBKIT_DIR/V8Bindings/SharedSources', + '$DERIVED_DIR', + '$SHARED_DIR', '$WEBKIT_DIR/port/bindings/v8', '$WEBKIT_DIR/WebCore', '$WEBKIT_DIR/WebCore/JavaScriptHeaders', @@ -144,10 +146,13 @@ 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", @@ -159,8 +164,8 @@ env.Append( PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings", - DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), - SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), + DERIVED_DIR = "$WEBKIT_DIR/V8Bindings/DerivedSources", + SHARED_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 @@ -280,4 +285,3 @@ 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) - |