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

Side by Side Diff: chrome/browser/browser.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 | « build/SConscript.main ('k') | chrome/browser/debugger/debugger.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/hunspell/using_hunspell.scons', 10 '$CHROME_DIR/third_party/hunspell/using_hunspell.scons',
11 '$CHROME_DIR/third_party/wtl/using_wtl.scons', 11 '$CHROME_DIR/third_party/wtl/using_wtl.scons',
12 '$GOOGLE_UPDATE_DIR/using_google_update.scons', 12 '$GOOGLE_UPDATE_DIR/using_google_update.scons',
13 '$GRIT_DIR/build/using_generated_resources.scons', 13 '$GRIT_DIR/build/using_generated_resources.scons',
14 '$GTEST_DIR/../using_gtest.scons', 14 '$GTEST_DIR/../using_gtest.scons',
15 '$ICU38_DIR/using_icu38.scons', 15 '$ICU38_DIR/using_icu38.scons',
16 '$LIBPNG_DIR/using_libpng.scons', 16 '$LIBPNG_DIR/using_libpng.scons',
17 '$LIBXML_DIR/using_libxml.scons', 17 '$LIBXML_DIR/using_libxml.scons',
18 '$MEDIA_DIR/using_media.scons', 18 '$MEDIA_DIR/using_media.scons',
19 '$NPAPI_DIR/using_npapi.scons', 19 '$NPAPI_DIR/using_npapi.scons',
20 '$SKIA_DIR/using_skia.scons', 20 '$SKIA_DIR/using_skia.scons',
21 '$ZLIB_DIR/using_zlib.scons', 21 '$ZLIB_DIR/using_zlib.scons',
22 ], {'env':env}) 22 ], {'env':env})
23 23
24 env.Append(
25 LIBS = [
26 'debugger',
27 'glue',
28 ],
29 )
30
24 env.Prepend( 31 env.Prepend(
25 CPPPATH = [ 32 CPPPATH = [
26 '$CHROME_DIR/app', 33 '$CHROME_DIR/app',
27 '$CHROME_SRC_DIR', 34 '$CHROME_SRC_DIR',
28 # To get the #include of history_indexer.h, 35 # To get the #include of history_indexer.h,
29 # generated from history/history_indexer.idl. 36 # generated from history/history_indexer.idl.
30 'history', 37 'history',
31 ], 38 ],
32 ) 39 )
33 40
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 901
895 xmldoc_tool_list = [ 902 xmldoc_tool_list = [
896 MSVSTool('VCCLCompilerTool', 903 MSVSTool('VCCLCompilerTool',
897 XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'), 904 XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'),
898 ObjectFile='$(IntDir)/$(InputName)1.obj'), 905 ObjectFile='$(IntDir)/$(InputName)1.obj'),
899 ] 906 ]
900 907
901 for filename in xmldoc_files: 908 for filename in xmldoc_files:
902 p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list) 909 p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list)
903 p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list) 910 p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list)
OLDNEW
« no previous file with comments | « build/SConscript.main ('k') | chrome/browser/debugger/debugger.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698