webkit/build/WebCore/SConscript - Issue 11017: Merge WebKit from r38950 -> r39000

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11017: Merge WebKit from r38950 -> r39000 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years 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 | Annotate | Revision Log

« no previous file with comments | « WEBKIT_MERGE_REVISION ('k') | webkit/build/WebCore/WebCore.vcproj » ('j') | no next file with comments »

OLD	NEW
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 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 '$WEBCORE_DIR/css/CSSPageRule.cpp',	60 '$WEBCORE_DIR/css/CSSPageRule.cpp',

61 '$WEBCORE_DIR/css/CSSParser.cpp',	61 '$WEBCORE_DIR/css/CSSParser.cpp',

62 '$WEBCORE_DIR/css/CSSParserValues.cpp',	62 '$WEBCORE_DIR/css/CSSParserValues.cpp',

63 '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp',	63 '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp',

64 '$WEBCORE_DIR/css/CSSProperty.cpp',	64 '$WEBCORE_DIR/css/CSSProperty.cpp',

65 '$WEBCORE_DIR/css/CSSReflectValue.cpp',	65 '$WEBCORE_DIR/css/CSSReflectValue.cpp',

66 '$WEBCORE_DIR/css/CSSRule.cpp',	66 '$WEBCORE_DIR/css/CSSRule.cpp',

67 '$WEBCORE_DIR/css/CSSRuleList.cpp',	67 '$WEBCORE_DIR/css/CSSRuleList.cpp',

68 '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp',	68 '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp',

69 '$WEBCORE_DIR/css/CSSSelector.cpp',	69 '$WEBCORE_DIR/css/CSSSelector.cpp',

	70 '$WEBCORE_DIR/css/CSSSelectorList.cpp',

70 '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp',	71 '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp',

71 '$WEBCORE_DIR/css/CSSStyleRule.cpp',	72 '$WEBCORE_DIR/css/CSSStyleRule.cpp',

72 '$WEBCORE_DIR/css/CSSStyleSelector.cpp',	73 '$WEBCORE_DIR/css/CSSStyleSelector.cpp',

73 '$WEBCORE_DIR/css/CSSStyleSheet.cpp',	74 '$WEBCORE_DIR/css/CSSStyleSheet.cpp',

74 '$WEBCORE_DIR/css/CSSTimingFunctionValue.cpp',	75 '$WEBCORE_DIR/css/CSSTimingFunctionValue.cpp',

75 '$WEBCORE_DIR/css/CSSUnicodeRangeValue.cpp',	76 '$WEBCORE_DIR/css/CSSUnicodeRangeValue.cpp',

76 '$WEBCORE_DIR/css/CSSValueList.cpp',	77 '$WEBCORE_DIR/css/CSSValueList.cpp',

77 '$WEBCORE_DIR/css/CSSVariableDependentValue.cpp',	78 '$WEBCORE_DIR/css/CSSVariableDependentValue.cpp',

78 '$WEBCORE_DIR/css/CSSVariablesDeclaration.cpp',	79 '$WEBCORE_DIR/css/CSSVariablesDeclaration.cpp',

79 '$WEBCORE_DIR/css/CSSVariablesRule.cpp',	80 '$WEBCORE_DIR/css/CSSVariablesRule.cpp',

(...skipping 746 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
826 env_p = env.Clone()	827 env_p = env.Clone()

827 env_p.Append(CCFLAGS='/Ylwebcore')	828 env_p.Append(CCFLAGS='/Ylwebcore')

828 pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc')	829 pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc')

829 env['PCH'] = pch	830 env['PCH'] = pch

830 env['PCHSTOP'] = 'precompiled_webkit.h'	831 env['PCHSTOP'] = 'precompiled_webkit.h'

831 env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])	832 env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])

832 input_files += [obj]	833 input_files += [obj]

833	834

834 env.ChromeStaticLibrary('WebCore', input_files)	835 env.ChromeStaticLibrary('WebCore', input_files)

835	836

OLD	NEW