Don't add the ATL and MFC directories to %INCLUDE% and %LIB% by default (as previously announced).

3 files changed, 15 insertions, 25 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index d9caa72..3d32281 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -15,6 +15,11 @@ RELEASE 0.97 - XXX
   - Allow Help() to be called multiple times, appending to the help
     text each call.
 
+  From Steven Knight:
+
+  - When compiling with Microsoft Visual Studio, don't include the ATL and
+    MFC directories in the default INCLUDE and LIB environment variables.
+
   From Gary Oberbrunner:
 
   - Add an Environment.Dump() method to print the contents of a
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index b0e8048..73cc941 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -33,6 +33,15 @@ RELEASE 0.97 - XXX
       variable, instead of returning them (the same way it handles
       the -l option).
 
+    - When compiling with Microsoft Visual Studio, SCons no longer
+      adds the ATL and MFC directories to the INCLUDE and LIB
+      environment variables by default.  If you want these directories
+      included in your environment variables, you should now set the
+      $MSVS_USE_MFC_DIRS *construction* variable when initializing
+      your environment:
+
+          env = Environment(MSVS_USE_MFC_DIRS = 1)
+
   Please note the following important changes since release 0.95:
 
     - All Builder calls (both built-in like Program(), Library(),
@@ -132,28 +141,6 @@ RELEASE 0.97 - XXX
       changed.  This change *only* affects any cases where you explicitly
       use UserList objects to initialize or append to a variable.
 
-  Please note the following FUTURE changes that you may wish to prepare
-  for:
-
-    - When compiling with Microsoft Visual Studio, SCons currently adds
-      the ATL and MFC directories to the INCLUDE and LIB environment
-      variables by default.  This default behavior will be changed in
-      a future release; the current plan is to change it for the 0.97
-      release (next beta release).
-
-      Whether or not the ATL and MFC directories are added to these
-      environment variables is now controlled by a new MSVS_USE_MFC_DIRS
-      *construction* variable.  Setting this variable to a non-zero
-      value when you initialize an Environment will ensure that these
-      directories will be included in your external path(s) even when
-      the default behavior changes:
-
-          env = Environment(MSVS_USE_MFC_DIRS = 1)
-
-      The MSVS_USE_MFC_DIRS variable may, of course, be set to 0 (or
-      None) to prevent SCons from adding the ATL and MFC directories to
-      the INCLUDE and LIB environment variables.
-
   SCons is developed with an extensive regression test suite, and a
   rigorous development methodology for continually improving that suite.
   Because of this, SCons is of sufficient quality that you can use it
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index d81f64d..34a1b94 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -454,9 +454,7 @@ def generate(env):
     try:
         version = SCons.Tool.msvs.get_default_visualstudio_version(env)
 
-        # By default, add the MFC directories, because this is what
-        # we've been doing for a long time.  We may change this.
-        use_mfc_dirs = env.get('MSVS_USE_MFC_DIRS', 1)
+        use_mfc_dirs = env.get('MSVS_USE_MFC_DIRS', 0)
         if env.get('MSVS_IGNORE_IDE_PATHS', 0):
             _get_paths = get_msvc_default_paths
         else: