diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2013-06-01 14:18:18 +0000 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-06-04 14:27:27 +0000 |
| commit | 16ca5428349c37d2ecb05dd85ac0e81b7da61ccd (patch) | |
| tree | 219f60ec8531db24b67bafb17ec68ef953e373f1 /solenv | |
| parent | 35b0a4cd274c1567cf0b8067eb01f17b82ee9f35 (diff) | |
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@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 45bf122c14bf..c26582f56011 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 b239cec2b7f4..fc63eba7c2ce 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 = \ |