diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 23:16:17 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 23:16:17 +0000 |
| commit | da18ddafd0c32c5bd8f36d0f696458ac56170926 (patch) | |
| tree | bc6af1b760303bba1ed42c0f54c3cc9ddb586ebb | |
| parent | 3003e5acb1f21c3910e2c64de263e7ff4809970d (diff) | |
| download | chromium_src-da18ddafd0c32c5bd8f36d0f696458ac56170926.zip chromium_src-da18ddafd0c32c5bd8f36d0f696458ac56170926.tar.gz chromium_src-da18ddafd0c32c5bd8f36d0f696458ac56170926.tar.bz2 | |
Fixing some windows scons build breaks.
Review URL: http://codereview.chromium.org/8723
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4186 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/SConscript | 3 | ||||
| -rw-r--r-- | chrome/browser/views/SConscript | 8 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 2 | ||||
| -rw-r--r-- | chrome/views/SConscript | 3 |
4 files changed, 4 insertions, 12 deletions
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index 243fffd8..5dbf23e 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -172,8 +172,6 @@ if env['PLATFORM'] == 'win32': 'external_protocol_handler.cc', 'external_tab_container.cc', 'fav_icon_helper.cc', - 'find_in_page_controller.cc', - 'find_in_page_view.cc', 'first_run.cc', 'frame_util.cc', 'gears_integration.cc', @@ -311,4 +309,3 @@ if env['PLATFORM'] in ('posix', 'win32'): if env['PLATFORM'] == 'win32': # TODO: Port this. SConscript('debugger/SConscript', exports=['env']) - diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript index 57c1e6f..d99443e 100644 --- a/chrome/browser/views/SConscript +++ b/chrome/browser/views/SConscript @@ -11,7 +11,7 @@ env.Prepend( CPPPATH = [ '$CHROME_DIR/app/resources', #'$OBJ_ROOT/google_update', - '/chrome/tools/build/win', + '$OBJ_ROOT/chrome/tools/build/win', '$CHROME_SRC_DIR', ], CPPDEFINES = [ @@ -35,7 +35,7 @@ env.Append( '$CHROME_DIR/third_party/hunspell/src/hunspell', '$CHROME_DIR/third_party/wtl/include', '$NPAPI_DIR', - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', '$LIBXML_DIR/include', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', @@ -137,7 +137,3 @@ input_files = [ ] env.ChromeStaticLibrary('browser_views', input_files) - - -SConscript('debugger/SConscript', exports=['env']) - diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index 603a25a..f788335 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -79,7 +79,7 @@ input_files = [ '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', 'view_event_test_base.cc', - '$CHROME_DIR/test/ui/npapi_test_helper.cc', + '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', ] diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 8836d09..21a936a 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -20,7 +20,7 @@ env.Prepend( env.Append( CPPPATH = [ - '../app/resources', + '$CHROME_DIR/app/resources', '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/include/platform', @@ -90,4 +90,3 @@ input_files = [ ] env.ChromeStaticLibrary('views', input_files) - |