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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/SConscript.main

Issue 8207: Fix SCons modules build on Windows:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months 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 | « base/base_unittests.scons ('k') | chrome/SConscript » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
===================================================================
--- build/SConscript.main (revision 3964)
+++ build/SConscript.main (working copy)
@@ -109,7 +109,14 @@
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 @@
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'),
« no previous file with comments | « base/base_unittests.scons ('k') | chrome/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698