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 /base | |
| 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 'base')
| -rw-r--r-- | base/base.scons | 2 | ||||
| -rw-r--r-- | base/base_unittests.scons | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/base/base.scons b/base/base.scons index 403eb26..66bfc83 100644 --- a/base/base.scons +++ b/base/base.scons @@ -15,5 +15,3 @@ sconscript_files = [ ] SConscript(sconscript_files, exports=['env']) - -env.Alias('base', '.') diff --git a/base/base_unittests.scons b/base/base_unittests.scons index f015a8f..8584df4 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -182,7 +182,8 @@ if env['PLATFORM'] == 'darwin': base_unittests = env.ChromeTestProgram('base_unittests', input_files) -env.Depends(base_unittests, '$EXPORTED_SYMBOLS_FILE') +if env['PLATFORM'] == 'posix': + env.Depends(base_unittests, '$EXPORTED_SYMBOLS_FILE') # Install up a level to allow unit test path assumptions to be valid. installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) |