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

Unified Diff: sandbox/tests/integration_tests/sbox_integration_tests.scons

Issue 11478: Finish replicating the *.vsprops structure. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/tests/common/sandbox_common.scons ('k') | sandbox/tests/unit_tests/sbox_unittests.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/tests/integration_tests/sbox_integration_tests.scons
===================================================================
--- sandbox/tests/integration_tests/sbox_integration_tests.scons (revision 5681)
+++ sandbox/tests/integration_tests/sbox_integration_tests.scons (working copy)
@@ -6,48 +6,19 @@
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 integration_tests.pch.ib_tag
# SCons doesn't know.
env_p = env.Clone()
« no previous file with comments | « sandbox/tests/common/sandbox_common.scons ('k') | sandbox/tests/unit_tests/sbox_unittests.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698