diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 05:28:56 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 05:28:56 +0000 |
| commit | 5112dc98f6d23ccec8bf08fb121ad8048d185fff (patch) | |
| tree | e99baff6bcc82419b839b5595fb84332ad97edb6 | |
| parent | d09e3de46fae6200b0cd1a79867dcbd147db938a (diff) | |
| download | chromium_src-5112dc98f6d23ccec8bf08fb121ad8048d185fff.zip chromium_src-5112dc98f6d23ccec8bf08fb121ad8048d185fff.tar.gz chromium_src-5112dc98f6d23ccec8bf08fb121ad8048d185fff.tar.bz2 | |
Update SCons build for PLATFORM(WIN) disable, and KJS build fix.
Review URL: http://codereview.chromium.org/8201
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3726 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/SConscript.port | 8 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 093ce42..1949ce3 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -53,6 +53,7 @@ input_files = [ '$PORT_DIR/platform/chromium/FramelessScrollView.cpp', '$PORT_DIR/platform/chromium/Language.cpp', '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp', + '$PORT_DIR/platform/chromium/PlatformKeyboardEventChromium.cpp', '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp', '$PORT_DIR/platform/chromium/PopupMenuChromium.cpp', '$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp', @@ -156,22 +157,16 @@ if env['PLATFORM'] == 'win32': '$PORT_DIR/platform/win/ClipboardUtilitiesWin.cpp', '$PORT_DIR/platform/win/ClipboardWin.cpp', '$PORT_DIR/platform/win/EditorWin.cpp', - '$PORT_DIR/platform/win/KeyEventWin.cpp', '$PORT_DIR/platform/win/PasteboardWin.cpp', - '$PORT_DIR/platform/win/PlatformMouseEventWin.cpp', '$PORT_DIR/platform/win/ScreenWin.cpp', '$PORT_DIR/platform/win/SoundWin.cpp', '$PORT_DIR/platform/UniscribeStateTextRun.cpp', '$PORT_DIR/platform/win/WCDataObject.cpp', - '$PORT_DIR/platform/win/WheelEventWin.cpp', '$PORT_DIR/platform/graphics/FontCacheWin.cpp', '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp', '$PORT_DIR/platform/graphics/FontWin.cpp', '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp', '$PORT_DIR/platform/graphics/IconWin.cpp', - '$PORT_DIR/platform/graphics/IntPointWin.cpp', - '$PORT_DIR/platform/graphics/IntRectWin.cpp', - '$PORT_DIR/platform/graphics/IntSizeWin.cpp', '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp', '$PORT_DIR/rendering/RenderThemeWin.cpp', ]) @@ -204,6 +199,7 @@ if env['PLATFORM'] == 'darwin': if env.get('KJS'): input_files.extend([ + '$PORT_DIR/bridge/KJSBridge.cpp', '$PORT_DIR/bridge/ScriptControllerKJS.cpp', ]) else: diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 7fa5242..103c032 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -164,7 +164,6 @@ wtf_inputs = [ if env['PLATFORM'] == 'win32': wtf_inputs.extend([ - '$WTF_DIR/win/MainThreadWin.cpp', '$WTF_DIR/ThreadingWin.cpp', ]) elif env['PLATFORM'] == 'posix': |