| 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 env.SConscript([ | 9 env.SConscript([ |
| 10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| 11 '$BASE_DIR/gfx/using_base_gfx.scons', | 11 '$BASE_DIR/gfx/using_base_gfx.scons', |
| 12 '$BZIP2_DIR/using_bzip2.scons', | 12 '$BZIP2_DIR/using_bzip2.scons', |
| 13 '$CHROME_DIR/third_party/wtl/using_wtl.scons', | 13 '$CHROME_DIR/third_party/wtl/using_wtl.scons', |
| 14 '$CHROME_SRC_DIR/build/using_googleurl.scons', | 14 '$CHROME_SRC_DIR/build/using_googleurl.scons', |
| 15 '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', |
| 15 '$GTEST_DIR/../using_gtest.scons', | 16 '$GTEST_DIR/../using_gtest.scons', |
| 16 '$ICU38_DIR/using_icu38.scons', | 17 '$ICU38_DIR/using_icu38.scons', |
| 17 '$LIBPNG_DIR/using_libpng.scons', | 18 '$LIBPNG_DIR/using_libpng.scons', |
| 18 '$LIBXML_DIR/using_libxml.scons', | 19 '$LIBXML_DIR/using_libxml.scons', |
| 19 '$LIBXSLT_DIR/using_libxslt.scons', | 20 '$LIBXSLT_DIR/using_libxslt.scons', |
| 20 '$MODP_B64_DIR/using_modp_b64.scons', | 21 '$MODP_B64_DIR/using_modp_b64.scons', |
| 21 '$NET_DIR/using_net.scons', | 22 '$NET_DIR/using_net.scons', |
| 22 #'$NPAPI_DIR/using_npapi.scons', | 23 #'$NPAPI_DIR/using_npapi.scons', |
| 23 '$SDCH_DIR/using_sdch.scons', | 24 '$SDCH_DIR/using_sdch.scons', |
| 24 '$SKIA_DIR/using_skia.scons', | 25 '$SKIA_DIR/using_skia.scons', |
| 25 '$ZLIB_DIR/using_zlib.scons', | 26 '$ZLIB_DIR/using_zlib.scons', |
| 26 ], {'env':env}) | 27 ], {'env':env}) |
| 27 | 28 |
| 28 env.Prepend( | 29 env.Prepend( |
| 29 CPPPATH = [ | 30 CPPPATH = [ |
| 30 '$CHROME_DIR/app/resources', | 31 '$CHROME_DIR/app/resources', |
| 31 '$CHROME_SRC_DIR', | 32 '$CHROME_SRC_DIR', |
| 32 ], | 33 ], |
| 33 CPPDEFINES = [ | 34 CPPDEFINES = [ |
| 34 'UI_TEST', | 35 'UI_TEST', |
| 35 ], | 36 ], |
| 36 LIBS = [ | 37 LIBS = [ |
| 38 'automation', |
| 37 'browser', | 39 'browser', |
| 38 'common', | 40 'common', |
| 41 'glue', |
| 42 'port', |
| 39 'sqlite', | 43 'sqlite', |
| 44 'WTF', |
| 40 ] | 45 ] |
| 41 ) | 46 ) |
| 42 | 47 |
| 43 if env.Bit('windows'): | 48 if env.Bit('windows'): |
| 44 # TODO(port): split these into upper env.Prepend (for portable libs) and | 49 # TODO(port): split these into upper env.Prepend (for portable libs) and |
| 45 # lower env.Prepend (for win-specific libs). | 50 # lower env.Prepend (for win-specific libs). |
| 46 env.Prepend( | 51 env.Prepend( |
| 47 LIBS = [ | 52 LIBS = [ |
| 48 'automation', | |
| 49 'browser_views', | 53 'browser_views', |
| 50 'npapi_layout_test_plugin', | 54 'npapi_layout_test_plugin', |
| 51 'npapi_test_plugin', | 55 'npapi_test_plugin', |
| 52 'port', | |
| 53 'security_tests', | 56 'security_tests', |
| 54 ], | 57 ], |
| 55 ) | 58 ) |
| 56 | 59 |
| 57 if env.Bit('windows'): | 60 if env.Bit('windows'): |
| 58 env.Prepend( | 61 env.Prepend( |
| 59 CPPPATH = [ | 62 CPPPATH = [ |
| 60 '$CHROME_DIR/tools/build/win', | 63 '$CHROME_DIR/tools/build/win', |
| 61 ], | 64 ], |
| 62 LINKFLAGS = [ | 65 LINKFLAGS = [ |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 '$(SolutionDir)/tools/build/win/js_engine.vsprops', | 385 '$(SolutionDir)/tools/build/win/js_engine.vsprops', |
| 383 '$(SolutionDir)../testing/using_gtest.vsprops', | 386 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 384 ]) | 387 ]) |
| 385 | 388 |
| 386 p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', | 389 p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', |
| 387 'Debug|Win32', | 390 'Debug|Win32', |
| 388 tools=[ | 391 tools=[ |
| 389 MSVSTool('VCCLCompilerTool', | 392 MSVSTool('VCCLCompilerTool', |
| 390 UsePrecompiledHeader='1'), | 393 UsePrecompiledHeader='1'), |
| 391 ]) | 394 ]) |
| OLD | NEW |