diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 07:38:33 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 07:38:33 +0000 |
| commit | 227581f23fd7ffed501cb6bc5bb88fe5bc050820 (patch) | |
| tree | 825e9f11d250375958856f1c24f40a243ba787f8 | |
| parent | fb6efeba20f414cf18503efdb0d99da6c8a10c1c (diff) | |
| download | chromium_src-227581f23fd7ffed501cb6bc5bb88fe5bc050820.zip chromium_src-227581f23fd7ffed501cb6bc5bb88fe5bc050820.tar.gz chromium_src-227581f23fd7ffed501cb6bc5bb88fe5bc050820.tar.bz2 | |
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
| -rw-r--r-- | webkit/SConscript | 4 | ||||
| -rw-r--r-- | webkit/SConscript.port | 8 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 6 |
3 files changed, 7 insertions, 11 deletions
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', diff --git a/webkit/SConscript.port b/webkit/SConscript.port index d3c8d6b5..ebe20dd 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -44,8 +44,8 @@ input_files = [ '$PORT_DIR/platform/GKURL.cpp', - '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp', '$PORT_DIR/platform/chromium/ContextMenuChromium.cpp', + '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp', '$PORT_DIR/platform/chromium/CursorChromium.cpp', '$PORT_DIR/platform/chromium/DragDataChromium.cpp', '$PORT_DIR/platform/chromium/DragImageChromium.cpp', @@ -56,9 +56,9 @@ input_files = [ '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp', '$PORT_DIR/platform/chromium/PlatformKeyboardEventChromium.cpp', '$PORT_DIR/platform/chromium/PopupMenuChromium.cpp', - '$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp', '$PORT_DIR/platform/chromium/SearchPopupMenuChromium.cpp', '$PORT_DIR/platform/chromium/SharedTimerChromium.cpp', + '$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp', '$PORT_DIR/platform/chromium/SystemTimeChromium.cpp', '$PORT_DIR/platform/chromium/TemporaryLinkStubs.cpp', '$PORT_DIR/platform/chromium/TextBoundariesChromium.cpp', @@ -145,6 +145,9 @@ if env['PLATFORM'] == 'darwin': if env['PLATFORM'] == 'win32': # These are win32 specific and will never be ported. input_files.extend([ + '$PORT_DIR/platform/chromium/FileSystemChromiumWin.cpp', + '$PORT_DIR/platform/chromium/ScrollBarThemeChromiumWin.cpp', + '$PORT_DIR/platform/UniscribeStateTextRun.cpp', '$PORT_DIR/platform/win/BString.cpp', '$PORT_DIR/platform/win/ClipboardUtilitiesWin.cpp', '$PORT_DIR/platform/win/ClipboardWin.cpp', @@ -152,7 +155,6 @@ if env['PLATFORM'] == 'win32': '$PORT_DIR/platform/win/PasteboardWin.cpp', '$PORT_DIR/platform/win/PlatformScreenWin.cpp', '$PORT_DIR/platform/win/SoundWin.cpp', - '$PORT_DIR/platform/UniscribeStateTextRun.cpp', '$PORT_DIR/platform/win/WCDataObject.cpp', '$PORT_DIR/platform/graphics/FontCacheWin.cpp', '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp', diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 17f771d..e0a29dd 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -794,12 +794,6 @@ if env['PLATFORM'] == 'posix': '$WEBCORE_DIR/platform/gtk/ScrollbarThemeGtk.cpp', ]) -# Windows specific files. -if env['PLATFORM'] == 'win32': - input_files.extend([ - '$WEBCORE_DIR/platform/win/FileSystemWin.cpp', - ]) - # Precompiled headers only work under MSVC in scons. if env['PLATFORM'] == 'win32': env_p = env.Clone() |