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

Side by Side Diff: chrome/renderer/renderer.scons

Issue 27054: Multiple fixes for broken Linux SHARED=1 build. (Closed)
Patch Set: Created 11 years, 10 months 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 | « chrome/browser/debugger/debugger.scons ('k') | chrome/test/unit/unit_tests.scons » ('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 env.SConscript([ 9 env.SConscript([
10 '$CHROME_DIR/third_party/wtl/using_wtl.scons', 10 '$CHROME_DIR/third_party/wtl/using_wtl.scons',
11 '$GRIT_DIR/build/using_generated_resources.scons', 11 '$GRIT_DIR/build/using_generated_resources.scons',
12 '$ICU38_DIR/using_icu38.scons', 12 '$ICU38_DIR/using_icu38.scons',
13 '$MEDIA_DIR/using_media.scons', 13 '$MEDIA_DIR/using_media.scons',
14 '$NPAPI_DIR/using_npapi.scons', 14 '$NPAPI_DIR/using_npapi.scons',
15 '$SKIA_DIR/using_skia.scons', 15 '$SKIA_DIR/using_skia.scons',
16 ], {'env':env}) 16 ], {'env':env})
17 17
18 env.Prepend( 18 env.Prepend(
19 CPPPATH = [ 19 CPPPATH = [
20 '$CHROME_SRC_DIR', 20 '$CHROME_SRC_DIR',
21 ], 21 ],
22 ) 22 )
23 23
24 env.Append(
25 LIBS = [
26 'common',
27 ],
28 )
29
24 if env.Bit('windows'): 30 if env.Bit('windows'):
25 env.Prepend( 31 env.Prepend(
26 CPPPATH = [ 32 CPPPATH = [
27 '$CHROME_DIR/tools/build/win', 33 '$CHROME_DIR/tools/build/win',
28 ], 34 ],
29 ) 35 )
30 36
31 input_files = ChromeFileList([ 37 input_files = ChromeFileList([
32 # TODO(sgk): violate standard indentation so we don't have to 38 # TODO(sgk): violate standard indentation so we don't have to
33 # reindent too much when we remove the explicit MSVSFilter() calls 39 # reindent too much when we remove the explicit MSVSFilter() calls
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 './renderer.vsprops', 181 './renderer.vsprops',
176 '$(SolutionDir)../build/release.vsprops', 182 '$(SolutionDir)../build/release.vsprops',
177 ]) 183 ])
178 184
179 p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', 185 p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
180 'Debug|Win32', 186 'Debug|Win32',
181 tools=[ 187 tools=[
182 MSVSTool('VCCLCompilerTool', 188 MSVSTool('VCCLCompilerTool',
183 UsePrecompiledHeader='1'), 189 UsePrecompiledHeader='1'),
184 ]) 190 ])
OLDNEW
« no previous file with comments | « chrome/browser/debugger/debugger.scons ('k') | chrome/test/unit/unit_tests.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698