diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-03 20:45:47 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-03 20:45:47 +0000 |
| commit | fc78fd42b81a97d3d15419e679f3ff9e0f470d9c (patch) | |
| tree | bde32a7774d8d727d42a011ffefede44ebfceb6c /build | |
| parent | 34004eea5940a37644ce70707470647091958cd2 (diff) | |
| download | chromium_src-fc78fd42b81a97d3d15419e679f3ff9e0f470d9c.zip chromium_src-fc78fd42b81a97d3d15419e679f3ff9e0f470d9c.tar.gz chromium_src-fc78fd42b81a97d3d15419e679f3ff9e0f470d9c.tar.bz2 | |
Allows scons build to use local copy of platformsdk if one is not bundled side-by-side.
Review URL: http://codereview.chromium.org/12915
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 10 | ||||
| -rw-r--r-- | build/internal/essential.scons | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 52ad42e..58d3e27 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -261,11 +261,17 @@ else: # as our source checkout. visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8' +# If side-by-side platform sdk is not available try local copy. +platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/files' +if (root_env['PLATFORM'] in ['win32', 'cygwin'] and + not os.path.exists(windows_env.subst(platform_sdk_path))): + platform_sdk_path = ( + msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0') + windows_env.Replace( CSCRIPT = 'c:\\Windows\\System32\\cscript', - PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', - PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0', + PLATFORMSDK_VISTA = platform_sdk_path, VISUAL_STUDIO = visual_studio_path, CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), diff --git a/build/internal/essential.scons b/build/internal/essential.scons index 56770d9..bca07f2 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -46,8 +46,8 @@ if env['PLATFORM'] == 'win32': ('_HAS_TR1', 0), ], CPPPATH = [ - '$PLATFORMSDK_VISTA/files/Include', - '$PLATFORMSDK_VISTA/files/VC/INCLUDE', + '$PLATFORMSDK_VISTA/Include', + '$PLATFORMSDK_VISTA/VC/INCLUDE', '$VISUAL_STUDIO/VC/atlmfc/include', ], CCFLAGS = [ @@ -76,8 +76,8 @@ if env['PLATFORM'] == 'win32': '/wd4819', ], LIBPATH = [ - '$PLATFORMSDK_VISTA/files/Lib', - '$PLATFORMSDK_VISTA/files/VC/LIB', + '$PLATFORMSDK_VISTA/Lib', + '$PLATFORMSDK_VISTA/VC/LIB', '$VISUAL_STUDIO/VC/atlmfc/lib', ], LIBS = [ |