diff options
Diffstat (limited to 'sandbox/tests/unit_tests/sbox_unittests.scons')
-rw-r--r-- | sandbox/tests/unit_tests/sbox_unittests.scons | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons index f311ede..02fc1b8 100644 --- a/sandbox/tests/unit_tests/sbox_unittests.scons +++ b/sandbox/tests/unit_tests/sbox_unittests.scons @@ -6,47 +6,19 @@ Import('env') env = env.Clone() -env.SConscript([ +env.ApplySConscript([ '$BASE_DIR/using_base.scons', '$GTEST_DIR/../using_gtest.scons', '$SANDBOX_DIR/using_sandbox.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) +]) if env['PLATFORM'] == 'win32': env.Append( - CPPDEFINES = [ - '_SECURE_ATL', - '_WINDOWS', - ], CCFLAGS = [ - '/TP', '/WX', # treat warnings as errors ], ) -env.Prepend( - LINKFLAGS = [ - '/DELAYLOAD:dwmapi.dll', - '/DELAYLOAD:uxtheme.dll', - '/MACHINE:X86', - '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], -) - - # TODO(bradnelson): This step generates unittests_tests.pch.ib_tag # SCons doesn't know. env_p = env.Clone() |