diff options
| -rwxr-xr-x | solenv/bin/concat-deps | bin | 0 -> 16335 bytes | |||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps Binary files differnew file mode 100755 index 000000000000..2fc20c33b2b5 --- /dev/null +++ b/solenv/bin/concat-deps diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 9a960a5647cb..cbd39d05f48d 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -481,11 +481,12 @@ endif gb_WinResTarget_POSTFIX :=.res +# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A define gb_WinResTarget__command $(call gb_Output_announce,$(2),$(true),RC ,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_RC) -nologo \ + $(gb_RC) \ $(DEFS) $(FLAGS) \ $(INCLUDE) \ -Fo$(1) \ |