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

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

Issue 14902: Add using_generated_resources.scons to the build. This (Closed)
Patch Set: derot Created 11 years, 11 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 '$GTEST_DIR/../using_gtest.scons', 14 '$GTEST_DIR/../using_gtest.scons',
14 '$ICU38_DIR/using_icu38.scons', 15 '$ICU38_DIR/using_icu38.scons',
15 '$LIBPNG_DIR/using_libpng.scons', 16 '$LIBPNG_DIR/using_libpng.scons',
16 '$LIBXML_DIR/using_libxml.scons', 17 '$LIBXML_DIR/using_libxml.scons',
17 '$NPAPI_DIR/using_npapi.scons', 18 '$NPAPI_DIR/using_npapi.scons',
18 '$SKIA_DIR/using_skia.scons', 19 '$SKIA_DIR/using_skia.scons',
19 '$ZLIB_DIR/using_zlib.scons', 20 '$ZLIB_DIR/using_zlib.scons',
20 ], {'env':env}) 21 ], {'env':env})
21 22
22 env.Prepend( 23 env.Prepend(
23 CPPPATH = [ 24 CPPPATH = [
24 '$TARGET_ROOT/grit_derived_sources',
25 '$CHROME_DIR/app', 25 '$CHROME_DIR/app',
26 '$CHROME_SRC_DIR', 26 '$CHROME_SRC_DIR',
27 # To get the #include of history_indexer.h, 27 # To get the #include of history_indexer.h,
28 # generated from history/history_indexer.idl. 28 # generated from history/history_indexer.idl.
29 'history', 29 'history',
30 ], 30 ],
31 ) 31 )
32 32
33 if env.Bit('windows'): 33 if env.Bit('windows'):
34 env.Prepend( 34 env.Prepend(
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 # TODO: This should work for all platforms. 323 # TODO: This should work for all platforms.
324 env.ChromeLibrary('browser', input_files) 324 env.ChromeLibrary('browser', input_files)
325 325
326 env.ChromeMSVSProject('$CHROME_DIR/browser/browser.vcproj', 326 env.ChromeMSVSProject('$CHROME_DIR/browser/browser.vcproj',
327 dependencies = [ 327 dependencies = [
328 '$LIBXML_DIR/build/libxml_config.vcproj', 328 '$LIBXML_DIR/build/libxml_config.vcproj',
329 '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', 329 '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
330 '$CHROME_DIR/app/generated_resources.vcproj', 330 '$CHROME_DIR/app/generated_resources.vcproj',
331 ], 331 ],
332 guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}') 332 guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}')
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