From 227581f23fd7ffed501cb6bc5bb88fe5bc050820 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Fri, 31 Oct 2008 07:38:33 +0000 Subject: SCons config changes from webkit merge: * Don't build platform\win\FileSystemWin.cpp. * Add platform\chromium\FileSystemChromiumWin.cpp. * Add platform\chromium\ScrollBarThemeChromiumWin.cpp. * icudt38.dll installs into $TARGET__ROOT, not $OBJ_ROOT. * Re-sort a few input file lists. Review URL: http://codereview.chromium.org/8957 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4277 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webkit/SConscript') diff --git a/webkit/SConscript b/webkit/SConscript index b1ae05a..d0fd611 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -259,9 +259,9 @@ env.SConscript(sconscript_dirs, exports=['env', 'env_res']) # directory tree as a huge content-signature string. # Instead we're going to let all the subsidiary SConscript files # add their own individual targets to the 'webkit' Alias. -#env.Alias('webkit', ['.', '$OBJ_ROOT/icudt38.dll']) +#env.Alias('webkit', ['.', '$TARGET_ROOT/icudt38.dll']) if env['PLATFORM'] == 'win32': - env.Alias('webkit', ['$OBJ_ROOT/icudt38.dll']) + env.Alias('webkit', ['$TARGET_ROOT/icudt38.dll']) version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', ['$WEBCORE_DIR/Configurations/Version.xcconfig', -- cgit v1.1