diff options
| -rw-r--r-- | build/SConscript.main | 10 | ||||
| -rw-r--r-- | build/internal/essential.scons | 8 | ||||
| -rw-r--r-- | sandbox/wow_helper/wow_helper.scons | 2 | ||||
| -rw-r--r-- | webkit/activex_shim/SConscript | 6 |
4 files changed, 14 insertions, 12 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 = [ diff --git a/sandbox/wow_helper/wow_helper.scons b/sandbox/wow_helper/wow_helper.scons index 798e472..532cb9a 100644 --- a/sandbox/wow_helper/wow_helper.scons +++ b/sandbox/wow_helper/wow_helper.scons @@ -19,8 +19,6 @@ if env['PLATFORM'] == 'win32': ], CPPPATH = [ '$CHROME_SRC_DIR', - '$PLATFORMSDK_VISTA/files/Include', - '$PLATFORMSDK_VISTA/files/VC/INCLUDE', ], CCFLAGS = [ '/nologo', diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript index 8845906..78663be 100644 --- a/webkit/activex_shim/SConscript +++ b/webkit/activex_shim/SConscript @@ -23,9 +23,8 @@ env.Append( '/WX', '/Wp64', ], -# TODO(bradnelson): Scons should really have a way to handle this. - ARFLAGS = [ - '/LIBPATH:$PLATFORMSDK_VISTA_REL', 'Urlmon.Lib', + LIBS = [ + 'Urlmon', ], ) @@ -41,4 +40,3 @@ input_files = [ ] env.ChromeStaticLibrary('activex_shim', input_files) - |