Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: webkit/build/WebCore/SConscript

Issue 8746: Linux fixes for the WebKit merge. (Closed)
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/build/V8Bindings/SConscript ('k') | webkit/build/port/SConscript » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 if env['PLATFORM'] == 'win32': 9 if env['PLATFORM'] == 'win32':
10 env.Append( 10 env.Append(
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 '$WEBCORE_DIR/loader/ResourceLoader.cpp', 338 '$WEBCORE_DIR/loader/ResourceLoader.cpp',
339 '$WEBCORE_DIR/loader/SubresourceLoader.cpp', 339 '$WEBCORE_DIR/loader/SubresourceLoader.cpp',
340 '$WEBCORE_DIR/loader/TextDocument.cpp', 340 '$WEBCORE_DIR/loader/TextDocument.cpp',
341 '$WEBCORE_DIR/loader/TextResourceDecoder.cpp', 341 '$WEBCORE_DIR/loader/TextResourceDecoder.cpp',
342 342
343 '$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp', 343 '$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp',
344 '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp', 344 '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp',
345 '$WEBCORE_DIR/loader/archive/ArchiveResourceCollection.cpp', 345 '$WEBCORE_DIR/loader/archive/ArchiveResourceCollection.cpp',
346 346
347 '$WEBCORE_DIR/page/AccessibilityImageMapLink.cpp', 347 '$WEBCORE_DIR/page/AccessibilityImageMapLink.cpp',
348 '$WEBCORE_DIR/page/AccessibilityList.cpp',
348 '$WEBCORE_DIR/page/AccessibilityListBox.cpp', 349 '$WEBCORE_DIR/page/AccessibilityListBox.cpp',
349 '$WEBCORE_DIR/page/AccessibilityListBoxOption.cpp', 350 '$WEBCORE_DIR/page/AccessibilityListBoxOption.cpp',
350 '$WEBCORE_DIR/page/AccessibilityObject.cpp', 351 '$WEBCORE_DIR/page/AccessibilityObject.cpp',
351 '$WEBCORE_DIR/page/AccessibilityRenderObject.cpp', 352 '$WEBCORE_DIR/page/AccessibilityRenderObject.cpp',
352 '$WEBCORE_DIR/page/AccessibilityTable.cpp', 353 '$WEBCORE_DIR/page/AccessibilityTable.cpp',
353 '$WEBCORE_DIR/page/AccessibilityTableCell.cpp', 354 '$WEBCORE_DIR/page/AccessibilityTableCell.cpp',
354 '$WEBCORE_DIR/page/AccessibilityTableColumn.cpp', 355 '$WEBCORE_DIR/page/AccessibilityTableColumn.cpp',
355 '$WEBCORE_DIR/page/AccessibilityTableHeaderContainer.cpp', 356 '$WEBCORE_DIR/page/AccessibilityTableHeaderContainer.cpp',
356 '$WEBCORE_DIR/page/AccessibilityTableRow.cpp', 357 '$WEBCORE_DIR/page/AccessibilityTableRow.cpp',
357 '$WEBCORE_DIR/page/AXObjectCache.cpp', 358 '$WEBCORE_DIR/page/AXObjectCache.cpp',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 '$WEBCORE_DIR/rendering/bidi.cpp', 475 '$WEBCORE_DIR/rendering/bidi.cpp',
475 '$WEBCORE_DIR/rendering/break_lines.cpp', 476 '$WEBCORE_DIR/rendering/break_lines.cpp',
476 '$WEBCORE_DIR/rendering/CounterNode.cpp', 477 '$WEBCORE_DIR/rendering/CounterNode.cpp',
477 '$WEBCORE_DIR/rendering/EllipsisBox.cpp', 478 '$WEBCORE_DIR/rendering/EllipsisBox.cpp',
478 '$WEBCORE_DIR/rendering/FixedTableLayout.cpp', 479 '$WEBCORE_DIR/rendering/FixedTableLayout.cpp',
479 '$WEBCORE_DIR/rendering/HitTestResult.cpp', 480 '$WEBCORE_DIR/rendering/HitTestResult.cpp',
480 '$WEBCORE_DIR/rendering/InlineBox.cpp', 481 '$WEBCORE_DIR/rendering/InlineBox.cpp',
481 '$WEBCORE_DIR/rendering/InlineFlowBox.cpp', 482 '$WEBCORE_DIR/rendering/InlineFlowBox.cpp',
482 '$WEBCORE_DIR/rendering/InlineTextBox.cpp', 483 '$WEBCORE_DIR/rendering/InlineTextBox.cpp',
483 '$WEBCORE_DIR/rendering/LayoutState.cpp', 484 '$WEBCORE_DIR/rendering/LayoutState.cpp',
485 '$WEBCORE_DIR/rendering/Length.cpp',
484 '$WEBCORE_DIR/rendering/ListMarkerBox.cpp', 486 '$WEBCORE_DIR/rendering/ListMarkerBox.cpp',
485 '$WEBCORE_DIR/rendering/MediaControlElements.cpp', 487 '$WEBCORE_DIR/rendering/MediaControlElements.cpp',
486 '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp', 488 '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp',
487 '$WEBCORE_DIR/rendering/RenderApplet.cpp', 489 '$WEBCORE_DIR/rendering/RenderApplet.cpp',
488 '$WEBCORE_DIR/rendering/RenderArena.cpp', 490 '$WEBCORE_DIR/rendering/RenderArena.cpp',
489 '$WEBCORE_DIR/rendering/RenderBlock.cpp', 491 '$WEBCORE_DIR/rendering/RenderBlock.cpp',
490 '$WEBCORE_DIR/rendering/RenderBox.cpp', 492 '$WEBCORE_DIR/rendering/RenderBox.cpp',
491 '$WEBCORE_DIR/rendering/RenderBR.cpp', 493 '$WEBCORE_DIR/rendering/RenderBR.cpp',
492 '$WEBCORE_DIR/rendering/RenderButton.cpp', 494 '$WEBCORE_DIR/rendering/RenderButton.cpp',
493 '$WEBCORE_DIR/rendering/RenderContainer.cpp', 495 '$WEBCORE_DIR/rendering/RenderContainer.cpp',
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 remove_files = [ 784 remove_files = [
783 # Missing WebCore::FrameView::printPanScrollIcon 785 # Missing WebCore::FrameView::printPanScrollIcon
784 '$WEBCORE_DIR/page/EventHandler.cpp', 786 '$WEBCORE_DIR/page/EventHandler.cpp',
785 ] 787 ]
786 for remove in remove_files: 788 for remove in remove_files:
787 input_files.remove(remove) 789 input_files.remove(remove)
788 790
789 if env['PLATFORM'] == 'posix': 791 if env['PLATFORM'] == 'posix':
790 input_files.extend([ 792 input_files.extend([
791 '$WEBCORE_DIR/platform/posix/FileSystemPOSIX.cpp', 793 '$WEBCORE_DIR/platform/posix/FileSystemPOSIX.cpp',
794 '$WEBCORE_DIR/platform/gtk/ScrollbarThemeGtk.cpp',
792 ]) 795 ])
793 796
794 # Windows specific files. 797 # Windows specific files.
795 if env['PLATFORM'] == 'win32': 798 if env['PLATFORM'] == 'win32':
796 input_files.extend([ 799 input_files.extend([
797 '$WEBCORE_DIR/platform/win/FileSystemWin.cpp', 800 '$WEBCORE_DIR/platform/win/FileSystemWin.cpp',
798 ]) 801 ])
799 802
800 # Precompiled headers only work under MSVC in scons. 803 # Precompiled headers only work under MSVC in scons.
801 if env['PLATFORM'] == 'win32': 804 if env['PLATFORM'] == 'win32':
802 env_p = env.Clone() 805 env_p = env.Clone()
803 env_p.Append(CCFLAGS='/Ylwebcore') 806 env_p.Append(CCFLAGS='/Ylwebcore')
804 pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc') 807 pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc')
805 env['PCH'] = pch 808 env['PCH'] = pch
806 env['PCHSTOP'] = 'precompiled_webkit.h' 809 env['PCHSTOP'] = 'precompiled_webkit.h'
807 env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) 810 env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
808 input_files += [obj] 811 input_files += [obj]
809 812
810 env.ChromeStaticLibrary('WebCore', input_files) 813 env.ChromeStaticLibrary('WebCore', input_files)
811 814
OLDNEW
« no previous file with comments | « webkit/build/V8Bindings/SConscript ('k') | webkit/build/port/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698