summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRobert Managan <ramanagan@att.net>2012-11-10 17:06:02 (GMT)
committerRobert Managan <ramanagan@att.net>2012-11-10 17:06:02 (GMT)
commit4bd813d80758da1feecbf998d3e497b5fd895cb3 (patch)
treeed1170051162594847fc8fc3f23b99ab6ff3c988 /src
parent57eacf5ab172af6072d334728029416c23eb53b4 (diff)
parenta9145df8c3056bc0daae495aac1280ad6ac95394 (diff)
downloadSCons-4bd813d80758da1feecbf998d3e497b5fd895cb3.zip
SCons-4bd813d80758da1feecbf998d3e497b5fd895cb3.tar.gz
SCons-4bd813d80758da1feecbf998d3e497b5fd895cb3.tar.bz2
merge latest commits from SCons main line
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/msvs.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index b10868f..211f9dc 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1654,6 +1654,10 @@ def projectEmitter(target, source, env):
t, s = solutionEmitter(target, target, env)
targetlist = targetlist + t
+ # Beginning with Visual Studio 2010 for each project file (.vcxproj) we have additional file (.vcxproj.filters)
+ if env['MSVS_VERSION'] >= 10.0:
+ targetlist.append(targetlist[0] + '.filters')
+
return (targetlist, sourcelist)
def solutionEmitter(target, source, env):