diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-25 17:20:48 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-25 17:20:48 +0000 |
| commit | 7002ac6566bb5472a99d0f8f3f6f4932e86dab44 (patch) | |
| tree | 2102518edab4ba7adbbbd38e7934be3c341de65b /chrome/test | |
| parent | 689e237ec010792fe78343d9eff48539050481b0 (diff) | |
| download | chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.zip chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.tar.gz chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.tar.bz2 | |
Fix SCons modules build on Windows:
* Add 'midl' Tool module.
* Filter out the default OS_WINDOWS= definition from the Hammer
modules, which messes up our build.
* Fix the $PLATFORMSDK_VISTA definition.
* Remove the current directory from the 'base' Alias (avoid cycles).
* Remove by-hand addition of .lib, .pdb and .ilk files to the target
list when build shared libraries (multiple places).
* Comment out a post-action Touch() of the themes/default resource.
(Thanks to bradnelson for many of the above individual fixes.)
Review URL: http://codereview.chromium.org/8207
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/activex_test_control/SConscript | 3 | ||||
| -rw-r--r-- | chrome/test/security_tests/SConscript | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript index 94598d2..a5426f5 100644 --- a/chrome/test/activex_test_control/SConscript +++ b/chrome/test/activex_test_control/SConscript @@ -41,8 +41,7 @@ input_files = [ 'chrome_test_control.cc', ] -dll = env.ChromeSharedLibrary(['activex_test_control', 'activex_test_control.lib'], - input_files) +dll = env.ChromeSharedLibrary('activex_test_control', input_files) i = env.Install('$TARGET_ROOT', dll) env.Alias('chrome', i) diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript index 0e6b4890..7e6ef65 100644 --- a/chrome/test/security_tests/SConscript +++ b/chrome/test/security_tests/SConscript @@ -41,15 +41,6 @@ input_files = [ '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}', ] -dll = env.ChromeSharedLibrary(['security_tests', - 'security_tests.lib', - 'security_tests.ilk', - 'security_tests.pdb'], - input_files) - -# TODO(sgk): can go away once ChromeSharedLibrary() handles this. -env.Install('$LIBS_DIR', dll[1]) - +dll = env.ChromeSharedLibrary('security_tests', input_files) i = env.Install('$TARGET_ROOT', dll) env.Alias('chrome', i) - |