diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 18:19:23 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 18:19:23 +0000 |
| commit | 3f09649ae0477cf182033a8d3d507716372c31ad (patch) | |
| tree | 32e8038b2c2847d95b1064f2e17a1363447fbc1e | |
| parent | 5fb60b8bb4aee98d0520c503a35e329a72c743b1 (diff) | |
| download | chromium_src-3f09649ae0477cf182033a8d3d507716372c31ad.zip chromium_src-3f09649ae0477cf182033a8d3d507716372c31ad.tar.gz chromium_src-3f09649ae0477cf182033a8d3d507716372c31ad.tar.bz2 | |
Windows SCons build fixes.
Review URL: http://codereview.chromium.org/17054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7546 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/SConscript | 4 | ||||
| -rw-r--r-- | chrome/browser/browser.scons | 3 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 944e1fd..142702b 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -62,6 +62,7 @@ env_dll = env.Clone() env_dll.ApplySConscript([ '$CHROME_SRC_DIR/build/using_v8.scons', + '$ICU38_DIR/using_icu38.scons', ]) env_dll.Prepend( @@ -105,7 +106,6 @@ env_dll.Append( 'net', 'skia', 'bzip2', - env_dll['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libjpeg', 'libpng', 'libxml', @@ -151,6 +151,8 @@ if env_dll.Bit('windows'): #'shlwapi.lib', #'winmm.lib', #'wsock32.lib', + + 'Urlmon', ], LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index c762b5a..ad274c4 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -176,6 +176,8 @@ if env.Bit('windows'): 'dom_ui/chrome_url_data_manager.cc', 'dom_ui/dom_ui_contents.cc', 'dom_ui/dom_ui_host.cc', + 'dom_ui/dom_ui.cc', + 'dom_ui/history_ui.cc', 'dom_ui/html_dialog_contents.cc', 'dom_ui/new_tab_ui.cc', 'download/download_exe.cc', @@ -191,6 +193,7 @@ if env.Bit('windows'): 'drag_utils.cc', 'encoding_menu_controller_delegate.cc', 'encryptor.cc', + 'extensions/extension_protocol.cc', 'external_protocol_handler.cc', 'external_tab_container.cc', 'fav_icon_helper.cc', diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 611e288..7da40ad 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -897,6 +897,9 @@ if env.Bit('windows'): '$WEBCORE_DIR/platform/graphics/chromium/ThemeHelperChromiumWin.cpp', '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelper.cpp', '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelperTextRun.cpp', + '$WEBCORE_DIR/platform/graphics/skia/SkiaFontWin.cpp', + + '$WEBCORE_DIR/rendering/RenderThemeChromiumWin.cpp', ]) if env.Bit('linux'): |