| 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.ApplySConscript([ |
| 10 '$GTEST_DIR/../using_gtest.scons', | 10 '$GTEST_DIR/../using_gtest.scons', |
| 11 ], {'env':env}) | 11 ]) |
| 12 | |
| 13 # Some of the sandbox sources include "gtest.h", so we need it | |
| 14 # in the base env here, not just in env_tests. | |
| 15 env.Prepend( | |
| 16 CPPPATH = [ | |
| 17 '$CHROME_SRC_DIR', | |
| 18 ], | |
| 19 CPPDEFINES = [ | |
| 20 'CHROMIUM_BUILD', | |
| 21 ], | |
| 22 ) | |
| 23 | 12 |
| 24 if env['PLATFORM'] == 'win32': | 13 if env['PLATFORM'] == 'win32': |
| 25 env.Append( | 14 env.Append( |
| 26 CPPDEFINES = [ | |
| 27 '_SECURE_ATL', | |
| 28 '_WINDOWS', | |
| 29 ], | |
| 30 CCFLAGS = [ | 15 CCFLAGS = [ |
| 31 '/TP', | |
| 32 '/WX', # treat warnings as errors | 16 '/WX', # treat warnings as errors |
| 33 ], | 17 ], |
| 34 ) | 18 ) |
| 35 | 19 |
| 36 input_files = [ | 20 input_files = [ |
| 37 'Wow64.cc', | 21 'Wow64.cc', |
| 38 'acl.cc', | 22 'acl.cc', |
| 39 'broker_services.cc', | 23 'broker_services.cc', |
| 40 'crosscall_server.cc', | 24 'crosscall_server.cc', |
| 41 'dep.cc', | 25 'dep.cc', |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 # TODO(bradnelson): This step generates sandbox.pch.ib_tag | 75 # TODO(bradnelson): This step generates sandbox.pch.ib_tag |
| 92 # SCons doesn't know. | 76 # SCons doesn't know. |
| 93 env_p = env.Clone() | 77 env_p = env.Clone() |
| 94 env_p.Append(CCFLAGS='/Ylsandbox') | 78 env_p.Append(CCFLAGS='/Ylsandbox') |
| 95 pch, obj = env_p.PCH(['sandbox.pch', 'stdafx.obj'], 'stdafx.cc') | 79 pch, obj = env_p.PCH(['sandbox.pch', 'stdafx.obj'], 'stdafx.cc') |
| 96 env['PCH'] = pch | 80 env['PCH'] = pch |
| 97 env['PCHSTOP'] = 'stdafx.h' | 81 env['PCHSTOP'] = 'stdafx.h' |
| 98 env.Append(CCPCHFLAGS = ['/FIstdafx.h']) | 82 env.Append(CCPCHFLAGS = ['/FIstdafx.h']) |
| 99 | 83 |
| 100 env.ChromeStaticLibrary('sandbox', input_files + [obj]) | 84 env.ChromeStaticLibrary('sandbox', input_files + [obj]) |
| OLD | NEW |