diff options
| author | Steven Knight <knight@baldmt.com> | 2009-01-10 13:51:03 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-01-10 13:51:03 (GMT) |
| commit | 75e77f7662c6f611e455cbe9a2304302b9f1a3dc (patch) | |
| tree | 37289be25dfb8c8521eef4fa86ad93a72c6145cf | |
| parent | 9bba0fccfb276f3686f0b9f76dbfd1a0a2bb63cb (diff) | |
| download | SCons-75e77f7662c6f611e455cbe9a2304302b9f1a3dc.zip SCons-75e77f7662c6f611e455cbe9a2304302b9f1a3dc.tar.gz SCons-75e77f7662c6f611e455cbe9a2304302b9f1a3dc.tar.bz2 | |
Update src/CHANGES.txt for recent checkins.
Use $WINDOWS_INSERT_DEF instead of the deprecated $WIN32_INSERT_DEF.
| -rw-r--r-- | src/CHANGES.txt | 18 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 3 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3cdc304..35578a4 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -13,7 +13,7 @@ RELEASE 1.X - XXX From Stanislav Baranov, Ted Johnson and Steven Knight: - Add support for batch compilation of Visual Studio C/C++ source - files, controlled by a new MSVC_BATCH construction variable. + files, controlled by a new $MSVC_BATCH construction variable. From Steven Knight: @@ -41,11 +41,27 @@ RELEASE 1.X - XXX - Support $SWIGOUTDIR values with spaces. + From Rob Managan: + + - Don't automatically try to build .pdf graphics files for + .eps files in \includegraphics{} calls in .tex files. + + From Greg Noel: + + - Handle quoted module names in SWIG source files. + From Gary Oberbrunner: - Allow AppendENVPath() and PrependENVPath() to interpret '#' for paths relative to the top-level SConstruct directory. + - Use the Borland ilink -e option to specify the output file name. + + - Document that the msvc Tool module uses $PCH, $PCHSTOP and $PDB. + + - Allow WINDOWS_INSERT_DEF=0 to disable --output-def when linking + under MinGW. + From Greg Spencer: - Support implicit dependency scanning of files encoded in utf-8 diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index a6e4478..a05ddc7 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -62,7 +62,8 @@ def shlib_generator(target, source, env, for_signature): if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature)) def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX') - if env.get("WIN32_INSERT_DEF",1) and def_target: \ + insert_def = env.subst("$WINDOWS_INSERT_DEF") + if not insert_def in ['', '0', 0] and def_target: \ cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature)) return [cmd] |