Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
7f8eb725
Commit
7f8eb725
authored
Dec 23, 2009
by
zhanyong.wan
Browse files
Removes support for MSVC 7.1 from the scons scripts.
parent
32de5f53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
13 deletions
+3
-13
scons/SConscript
scons/SConscript
+0
-7
scons/SConstruct
scons/SConstruct
+3
-6
No files found.
scons/SConscript
View file @
7f8eb725
...
@@ -110,13 +110,6 @@ if env['PLATFORM'] == 'win32':
...
@@ -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
...
...
scons/SConstruct
View file @
7f8eb725
...
@@ -39,7 +39,7 @@
...
@@ -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-opt
8
build the given build type.
EnsurePythonVersion
(
2
,
3
)
EnsurePythonVersion
(
2
,
3
)
...
@@ -88,11 +88,8 @@ sconstruct_helper.Initialize(build_root_path='..',
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment