diff options
| author | William Deegan <bill@baddogconsulting.com> | 2010-01-11 01:48:50 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2010-01-11 01:48:50 (GMT) |
| commit | a22788e5c8ab01e003466f0f89ad5ebb60d19a57 (patch) | |
| tree | 2a6ea818194a7b765d7e56c9dbb9e01183b99803 /src | |
| parent | 01190c49cc22302428a421b2da7761afd2cf3549 (diff) | |
| download | SCons-a22788e5c8ab01e003466f0f89ad5ebb60d19a57.zip SCons-a22788e5c8ab01e003466f0f89ad5ebb60d19a57.tar.gz SCons-a22788e5c8ab01e003466f0f89ad5ebb60d19a57.tar.bz2 | |
Fix for 2422
Diffstat (limited to 'src')
| -rw-r--r-- | src/RELEASE.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mslink.xml | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.xml | 109 |
3 files changed, 3 insertions, 110 deletions
diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 8050c03..d7bdd74 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -80,6 +80,9 @@ RELEASE 1.2.0.d20090223 - Mon, 23 Feb 2009 08:41:06 -0800 these tools have been redefined to remove unnecessary nested $( and $) character strings. + -- MSVS_USE_MFC_DIRS and MSVS_IGNORE_IDE_PATHS are obsoleted and + have no effect. + Please note the following important changes since release 1.1.0: -- THE $CHANGED_SOURCES, $CHANGED_TARGETS, $UNCHANGED_SOURCES diff --git a/src/engine/SCons/Tool/mslink.xml b/src/engine/SCons/Tool/mslink.xml index 6ad9dea..92be026 100644 --- a/src/engine/SCons/Tool/mslink.xml +++ b/src/engine/SCons/Tool/mslink.xml @@ -46,7 +46,6 @@ LDMODULECOM SHLINKCOMSTR LINKCOMSTR REGSVRCOMSTR -MSVS_IGNORE_IDE_PATHS LDMODULECOMSTR </uses> </tool> diff --git a/src/engine/SCons/Tool/msvs.xml b/src/engine/SCons/Tool/msvs.xml index 7fe0801..f040f4d 100644 --- a/src/engine/SCons/Tool/msvs.xml +++ b/src/engine/SCons/Tool/msvs.xml @@ -287,37 +287,6 @@ will generate an error. </summary> </cvar> -<cvar name="MSVS_IGNORE_IDE_PATHS"> -<summary> -Tells the MS Visual Studio tools to use minimal INCLUDE, LIB, and PATH settings, -instead of the settings from the IDE. - -For Visual Studio, SCons will (by default) automatically determine -where MSVS is installed, and use the LIB, INCLUDE, and PATH variables -set by the IDE. You can override this behavior by setting these -variables after Environment initialization, or by setting -<envar>MSVS_IGNORE_IDE_PATHS = 1</envar> -in the Environment initialization. -Specifying this will not leave these unset, but will set them to a -minimal set of paths needed to run the tools successfully. - -For VS6, the mininimal set is: -<example> - INCLUDE:'<VSDir>\VC98\ATL\include;<VSDir>\VC98\MFC\include;<VSDir>\VC98\include' - LIB:'<VSDir>\VC98\MFC\lib;<VSDir>\VC98\lib' - PATH:'<VSDir>\Common\MSDev98\bin;<VSDir>\VC98\bin' -</example> -For VS7, it is: -<example> - INCLUDE:'<VSDir>\Vc7\atlmfc\include;<VSDir>\Vc7\include' - LIB:'<VSDir>\Vc7\atlmfc\lib;<VSDir>\Vc7\lib' - PATH:'<VSDir>\Common7\Tools\bin;<VSDir>\Common7\Tools;<VSDir>\Vc7\bin' -</example> - -Where '<VSDir>' is the installed location of Visual Studio. -</summary> -</cvar> - <cvar name="MSVS_PROJECT_BASE_PATH"> <summary> The string @@ -411,84 +380,6 @@ There is no default value. </summary> </cvar> -<cvar name="MSVS_USE_MFC_DIRS"> -<summary> -Tells the MS Visual Studio tool(s) to use -the MFC directories in its default paths -for compiling and linking. -The &cv-MSVS_USE_MFC_DIRS; variable has no effect if the -<envar>INCLUDE</envar> -or -<envar>LIB</envar> -environment variables are set explictly. - -Under Visual Studio version 6, -setting -&cv-MSVS_USE_MFC_DIRS; -to a non-zero value -adds the -<filename>ATL\include</filename> -and -<filename>MFC\include</filename> -directories to -the default -<envar>INCLUDE</envar> -external environment variable, -and adds the -<filename>MFC\lib</filename> -directory to -the default -<envar>LIB</envar> -external environment variable. - -Under Visual Studio version 7, -setting -&cv-MSVS_USE_MFC_DIRS; -to a non-zero value -adds the -<filename>atlmfc\include</filename> -directory to the default -<envar>INCLUDE</envar> -external environment variable, -and adds the -<filename>atlmfc\lib</filename> -directory to the default -<envar>LIB</envar> -external environment variable. - -Under Visual Studio version 8, -setting -&cv-MSVS_USE_MFC_DIRS; -to a non-zero value will, -by default, -add the -<filename>atlmfc\include</filename> -directory to the default -<envar>INCLUDE</envar> -external environment variable, -and the -<filename>atlmfc\lib</filename> -directory to the default -<envar>LIB</envar> -external environment variable. -If, however, the -<envar>['MSVS']['PLATFORMSDKDIR']</envar> -variable is set, -then the -<filename>mfc</filename> -and the -<filename>atl</filename> -subdirectories of the -<envar>PLATFORMSDKDIR</envar> -are added to the default value of the -<envar>INCLUDE</envar> -external environment variable, -and the default value of the -<envar>LIB</envar> -external environment variable is left untouched. -</summary> -</cvar> - <cvar name="MSVS_VERSION"> <summary> Sets the preferred version of Microsoft Visual Studio to use. |