eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes support for MSVC 7.1 from the scons scripts.

Browse Source
This commit is contained in:
zhanyong.wan 2009-12-23 20:48:53 +00:00
parent 32de5f5376
commit 7f8eb725b5
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scons/SConscript
View File

@ -110,13 +110,6 @@ if env['PLATFORM'] == 'win32':
env.Append(CCFLAGS=[ env.Append(CCFLAGS=[
'-wd4127', # Disables warning "conditional expression is constant", '-wd4127', # Disables warning "conditional expression is constant",
# triggered by VC 8.0's own STL header <list>. # triggered by VC 8.0's own STL header <list>.
'-wd4702', # Disables warning "unreachable code", triggered by VC
# 7.1's own STL header <xtree>.
'-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 # Note: The relative paths in SConscript files are relative to the location

9
scons/SConstruct
View File

@ -39,7 +39,7 @@
# where frequently used command-line options include: # where frequently used command-line options include:
# -h print usage help. # -h print usage help.
# BUILD=all build all build types. # 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) EnsurePythonVersion(2, 3)
@ -88,11 +88,8 @@ sconstruct_helper.Initialize(build_root_path='..',
win_base = sconstruct_helper.MakeWinBaseEnvironment() win_base = sconstruct_helper.MakeWinBaseEnvironment()
if win_base.get('MSVS_VERSION', None) == '7.1': sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg8')
sconstruct_helper.EnvCreator.WithExceptions(win_base) sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt8')
sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg')
sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt')
sconstruct_helper.ConfigureGccEnvironments() sconstruct_helper.ConfigureGccEnvironments()