From d7afbad0ff0b530dc03efae15ecaf763e2f74856 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Wed, 23 Dec 2009 20:48:53 +0000 Subject: Removes support for MSVC 7.1 from the scons scripts. git-svn-id: http://googlemock.googlecode.com/svn/trunk@253 8415998a-534a-0410-bf83-d39667b30386 --- scons/SConscript | 7 ------- scons/SConstruct | 9 +++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/scons/SConscript b/scons/SConscript index 7c2bfbf..764cd7b 100644 --- a/scons/SConscript +++ b/scons/SConscript @@ -110,13 +110,6 @@ if env['PLATFORM'] == 'win32': env.Append(CCFLAGS=[ '-wd4127', # Disables warning "conditional expression is constant", # triggered by VC 8.0's own STL header . - '-wd4702', # Disables warning "unreachable code", triggered by VC - # 7.1's own STL header . - '-wd4675', # Disables warning "resolved overload was found by - # argument-dependent lookup" generated by VC 7.1. - # It just says that VC 7.1 fixed a bug in earlier - # versions of VC so the code behavior will be - # different than compiled with VC 6.0, for example. ]) # Note: The relative paths in SConscript files are relative to the location diff --git a/scons/SConstruct b/scons/SConstruct index 71707fc..8f67d70 100644 --- a/scons/SConstruct +++ b/scons/SConstruct @@ -39,7 +39,7 @@ # where frequently used command-line options include: # -h print usage help. # BUILD=all build all build types. -# BUILD=win-opt build the given build type. +# BUILD=win-opt8 build the given build type. EnsurePythonVersion(2, 3) @@ -88,11 +88,8 @@ sconstruct_helper.Initialize(build_root_path='..', win_base = sconstruct_helper.MakeWinBaseEnvironment() -if win_base.get('MSVS_VERSION', None) == '7.1': - sconstruct_helper.EnvCreator.WithExceptions(win_base) - -sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg') -sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt') +sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg8') +sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt8') sconstruct_helper.ConfigureGccEnvironments() -- cgit v1.2.1