diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 18:58:47 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 18:58:47 +0000 |
| commit | 8abac0e2394f8609c42de92295feb9a8393ed87c (patch) | |
| tree | 0641447e66c0c60808f119d14f85ba111aa2f7f3 /sandbox/src | |
| parent | 6aa376b2bfe85c851edca7fc04a05960bc419051 (diff) | |
| download | chromium_src-8abac0e2394f8609c42de92295feb9a8393ed87c.zip chromium_src-8abac0e2394f8609c42de92295feb9a8393ed87c.tar.gz chromium_src-8abac0e2394f8609c42de92295feb9a8393ed87c.tar.bz2 | |
Fix SCons sandbox builds to parallel accumulated VS changes:
* Add CHROMIUM_BUILD and _SECURE_ATL defines.
* No /Wp64.
* Add unload_dll_test.cc.
Review URL: http://codereview.chromium.org/4224
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src')
| -rw-r--r-- | sandbox/src/SConscript | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript index 6cadb29..8914ba2 100644 --- a/sandbox/src/SConscript +++ b/sandbox/src/SConscript @@ -6,17 +6,17 @@ Import('env') env = env.Clone() -env.Prepend( - CPPPATH = [ - '../..', - ], -) - # Some of the sandbox sources include "gtest.h", so we need it # in the base env here, not just in env_tests. -env.Append( +env.Prepend( CPPPATH = [ '$GTEST_DIR/include', + '$GTEST_DIR', + '../..', + ], + CPPDEFINES = [ + 'CHROMIUM_BUILD', + '_SECURE_ATL', ], ) @@ -24,7 +24,6 @@ env.Append( CCFLAGS = [ '/TP', '/WX', # treat warnings as errors - '/Wp64', # warn about potential 64-bit problems ], ) @@ -91,7 +90,6 @@ input_files = [ 'win_utils.cc', ] - # TODO(bradnelson): This step generates sandbox.pch.ib_tag # SCons doesn't know. env_p = env.Clone() @@ -188,6 +186,7 @@ integration_test_files = [ 'process_policy_test.cc', 'registry_policy_test.cc', 'sync_policy_test.cc', + 'unload_dll_test.cc', '$INTEGRATION_TESTS_DIR/integration_tests$OBJSUFFIX', # The VisualStudio build link with the old gtest.obj file directly, |