diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-03-07 15:20:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 15:20:19 -0500 |
| commit | 6a0f197c4540d11f5edaf216c4300347eea957ed (patch) | |
| tree | 52877273b2b1dd5188004990badb38134aeb0bcc | |
| parent | 022a13375ece8cdfc8b86e9f08e4348af6643d61 (diff) | |
| parent | 3047ca665429fdfdb5342493843443b5ce224d46 (diff) | |
| download | scons-git-origin.tar.gz | |
Merge pull request #3326 from macqm/macqm-rcflags-nologoorigin
Add /nologo flag to RCFLAGS
| -rwxr-xr-x | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7d8e8d46d..6d8125ffd 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -37,7 +37,9 @@ RELEASE 3.0.5.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Bernhard M. Wiedemann: - Do not store build host+user name if reproducible builds are wanted - + + From Maciej Kumorek: + - Update the MSVC tool to include the nologo flag by default in RCFLAGS RELEASE 3.0.4 - Mon, 20 Jan 2019 22:49:27 +0000 diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index 23520885b..6cfa24546 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -262,7 +262,7 @@ def generate(env): env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 env['RC'] = 'rc' - env['RCFLAGS'] = SCons.Util.CLVar('') + env['RCFLAGS'] = SCons.Util.CLVar('/nologo') env['RCSUFFIXES']=['.rc','.rc2'] env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES' env['BUILDERS']['RES'] = res_builder |