[Libreoffice-commits] core.git: solenv/gbuild

[Isamu Mogi]

 solenv/gbuild/platform/com_MSC_class.mk |    1 -
 solenv/gbuild/platform/com_MSC_defs.mk  |    5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 16ca5428349c37d2ecb05dd85ac0e81b7da61ccd
Author: Isamu Mogi <saturday6c at gmail.com>
Date:   Sat Jun 1 14:18:18 2013 +0000

    gbuild: Add -nologo option for rc.exe in VC2012
    
    rc.exe in Windows SDK version higher than 6.0A accepts -nologo.
    And according to configure.ac:3131 VC2012 can't use 7.x, 6.0A or older.
    So it's a safe bet.
    
    Change-Id: I833e96adad322bb0f5eed36c9a09ece88111b5f7
    Reviewed-on: https://gerrit.libreoffice.org/4127
    Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
    Tested-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 45bf122..c26582f 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -482,7 +482,6 @@ 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,\
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index b239cec..fc63eba 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -190,6 +190,11 @@ ifeq ($(VCVER),100)
 
 endif
 
+ifeq ($(shell [ $(VCVER) -ge 110 ] && echo $(true)),$(true))
+# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
+gb_RCFLAGS += -nologo
+endif
+
 # C4005: 'identifier' : macro redefinition
 
 gb_PCHWARNINGS = \