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 /build | |
| 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 'build')
| -rw-r--r-- | build/SConscript.main | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index b712629..69f7ef3 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -109,6 +109,13 @@ env.AddMethod(ChromeObject) if env['PLATFORM'] == 'win32': env.Tool('target_platform_windows') env.Tool('target_debug') + env.Tool('midl') + + # TODO(bradnelson): this is needed for now because target_platform_windows + # has OS_WINDOWS defined in a weird way. + env.FilterOut(CPPDEFINES = ['OS_WINDOWS=OS_WINDOWS']) + + env['PDB'] = '${TARGET.base}.pdb' processors = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) SetOption('num_jobs', processors + 1) @@ -124,7 +131,7 @@ if env['PLATFORM'] == 'win32': CSCRIPT = 'c:\\Windows\\System32\\cscript', PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', - PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/$PLATFORMSDK_VISTA_REL', + PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0', VISUAL_STUDIO = visual_studio_path, CYGWIN_DIR = env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), |