diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 21:33:01 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 21:33:01 +0000 |
| commit | 97d201b98019051b05093a2457edd079b4a2d9ac (patch) | |
| tree | 47bc3331cc7e3d9f64ed402780d778fae7421922 /webkit/SConscript | |
| parent | 79867b59fa6bbfb55fcd9a6b6ba6b7d55a68539e (diff) | |
| download | chromium_src-97d201b98019051b05093a2457edd079b4a2d9ac.zip chromium_src-97d201b98019051b05093a2457edd079b4a2d9ac.tar.gz chromium_src-97d201b98019051b05093a2457edd079b4a2d9ac.tar.bz2 | |
Start porting port. Also move perl declarations into the correct place
for posix systems. Also remove stray qualifiers in C++ files.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 5e3e308..4512d83 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -40,11 +40,6 @@ port_dir = env.Dir('#/$BUILD_TYPE/webkit/port') port_dir.addRepository(env.Dir('#/../webkit/port')) port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore')) -# Point to perl. We do this so we don't have to set the +x bit on scripts -# because we can't currently modify the third_party/WebKit repository. -if env['PLATFORM'] == 'posix': - env.Append(PERL = '/usr/bin/perl') - env.Prepend( CPPPATH = [ '$WEBKIT_DIR/build/localized_strings', @@ -198,12 +193,17 @@ if env['PLATFORM'] == 'win32': '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32', ]) else: + env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8']) + sconscript_dirs = [ # TODO(erg): For now, only JavaScriptCore compiles and links; the rest is next. # 'SConscript.port', 'SConscript.javascriptcore_pcre', 'build/JSConfig/SConscript', 'build/JavaScriptCore/SConscript', +# 'build/localized_strings/SConscript', + 'build/port/SConscript', +# 'build/V8Bindings/SConscript', # 'build/WebCore/SConscript', ] env.SConscript(sconscript_dirs, exports=['env', 'env_res']) |