solenv/bin/concat-deps |binary solenv/gbuild/platform/com_MSC_class.mk | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit de1cbc17952a7e5838c0ded2ed3042171cb997c4 Author: Michael Stahl <[email protected]> Date: Mon Dec 17 13:41:12 2012 +0100 Revert "hide rc.exe splash screen" This reverts commit c2e3d09bb740749e1a6e045ff08bf32e5812fa9e. Quoting from my last revert of the exact same rc.exe -nologo: commit a6e3c2b4800144df40e5f78f6f912cdc6a575a32 gbuild: Microsoft Resource Compiler does not do -nologo At least the version 6.1.6723.1 that is in the Windows SDK 6.0A only complains about "invalid option: -ologo". Change-Id: Id6affdf4c833796691c903257dd515cc0d0e861e diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps new file mode 100755 index 0000000..2fc20c3 Binary files /dev/null and b/solenv/bin/concat-deps differ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 9a960a5..cbd39d0 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) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
