diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-11-24 04:33:17 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-11-24 04:33:17 (GMT) |
| commit | 11a934992efec6232aa07c2a09c26df1cc26b685 (patch) | |
| tree | edb6dec225963ab2ed0055a2bf56599ebe654a56 /SCons/Tool | |
| parent | b0a643847dcf0e37848f9abf7bb1dab0dbd73505 (diff) | |
| parent | becb5c6cbc5a370b4778374771777c2b493eaa05 (diff) | |
| download | SCons-11a934992efec6232aa07c2a09c26df1cc26b685.zip SCons-11a934992efec6232aa07c2a09c26df1cc26b685.tar.gz SCons-11a934992efec6232aa07c2a09c26df1cc26b685.tar.bz2 | |
Merge branch 'wix-win' of git://github.com/mwichmann/scons into mwichmann-wix-win
Diffstat (limited to 'SCons/Tool')
| -rw-r--r-- | SCons/Tool/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/SCons/Tool/__init__.py b/SCons/Tool/__init__.py index 0c7afb8..87139f1 100644 --- a/SCons/Tool/__init__.py +++ b/SCons/Tool/__init__.py @@ -694,7 +694,7 @@ def tool_list(platform, env): assemblers = ['masm', 'nasm', 'gas', '386asm'] fortran_compilers = ['gfortran', 'g77', 'ifl', 'cvf', 'f95', 'f90', 'fortran'] ars = ['mslib', 'ar', 'tlib'] - other_plat_tools = ['msvs', 'midl'] + other_plat_tools = ['msvs', 'midl', 'wix'] elif str(platform) == 'os2': "prefer IBM tools on OS/2" linkers = ['ilink', 'gnulink', ] # 'mslink'] @@ -794,7 +794,6 @@ def tool_list(platform, env): # TODO: merge 'install' into 'filesystem' and # make 'filesystem' the default 'filesystem', - 'wix', # 'midl', 'msvs', # Parser generators 'lex', 'yacc', # Foreign function interface |