| 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 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| 11 '$GTEST_DIR/../using_gtest.scons', | 11 '$GTEST_DIR/../using_gtest.scons', |
| 12 '$SANDBOX_DIR/using_sandbox.scons', | 12 '$SANDBOX_DIR/using_sandbox.scons', |
| 13 ], {'env':env}) | 13 ]) |
| 14 | |
| 15 env.Prepend( | |
| 16 CPPPATH = [ | |
| 17 '$CHROME_SRC_DIR', | |
| 18 ], | |
| 19 CPPDEFINES = [ | |
| 20 'CHROMIUM_BUILD', | |
| 21 ], | |
| 22 ) | |
| 23 | 14 |
| 24 if env['PLATFORM'] == 'win32': | 15 if env['PLATFORM'] == 'win32': |
| 25 env.Append( | 16 env.Append( |
| 26 CPPDEFINES = [ | |
| 27 '_SECURE_ATL', | |
| 28 '_WINDOWS', | |
| 29 ], | |
| 30 CCFLAGS = [ | 17 CCFLAGS = [ |
| 31 '/TP', | |
| 32 '/WX', # treat warnings as errors | 18 '/WX', # treat warnings as errors |
| 33 ], | 19 ], |
| 34 ) | 20 ) |
| 35 | 21 |
| 36 env.Prepend( | 22 env.Prepend( |
| 37 LINKFLAGS = [ | |
| 38 '/DELAYLOAD:dwmapi.dll', | |
| 39 '/DELAYLOAD:uxtheme.dll', | |
| 40 '/MACHINE:X86', | |
| 41 '/FIXED:No', | |
| 42 '/safeseh', | |
| 43 '/dynamicbase', | |
| 44 '/ignore:4199', | |
| 45 '/nxcompat', | |
| 46 ], | |
| 47 LIBS = [ | 23 LIBS = [ |
| 48 'shlwapi', | 24 'shlwapi', |
| 49 ], | 25 ], |
| 50 ) | 26 ) |
| 51 | 27 |
| 52 | 28 |
| 53 # TODO(bradnelson): This step generates unittests_tests.pch.ib_tag | 29 # TODO(bradnelson): This step generates unittests_tests.pch.ib_tag |
| 54 # SCons doesn't know. | 30 # SCons doesn't know. |
| 55 env_p = env.Clone() | 31 env_p = env.Clone() |
| 56 pch, obj = env_p.PCH(['unit_tests.pch', 'unit_tests.obj'], | 32 pch, obj = env_p.PCH(['unit_tests.pch', 'unit_tests.obj'], |
| 57 'unit_tests.cc') | 33 'unit_tests.cc') |
| 58 env['PCH'] = pch | 34 env['PCH'] = pch |
| 59 env['PCHSTOP'] = 'stdafx.h' | 35 env['PCHSTOP'] = 'stdafx.h' |
| 60 env.Append(CCPCHFLAGS = ['/FIstdafx.h']) | 36 env.Append(CCPCHFLAGS = ['/FIstdafx.h']) |
| 61 | 37 |
| 62 | 38 |
| 63 input_files = [ | 39 input_files = [ |
| 64 obj, | 40 obj, |
| 65 | 41 |
| 66 'suite.cc', | 42 'suite.cc', |
| 67 'commands.cc', | 43 'commands.cc', |
| 68 | 44 |
| 69 '../common/controller$OBJSUFFIX', | 45 '../common/controller$OBJSUFFIX', |
| 70 ] | 46 ] |
| 71 | 47 |
| 72 env.ChromeTestProgram('sbox_validation_tests', input_files, | 48 env.ChromeTestProgram('sbox_validation_tests', input_files, |
| 73 COMPONENT_PLATFORM_SETUP=None) | 49 COMPONENT_PLATFORM_SETUP=None) |
| OLD | NEW |