mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: Add -nologo option for rc.exe in VC2012

Browse Source 
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>
This commit is contained in:
Isamu Mogi
2013-06-01 14:18:18 +00:00
committed by Luboš Luňák
parent 35b0a4cd27
commit 16ca542834
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/gbuild/platform/com_MSC_class.mk
View File

@@ -482,7 +482,6 @@ endif
gb_WinResTarget_POSTFIX :=.res 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 define gb_WinResTarget__command
$(call gb_Output_announce,$(2),$(true),RC ,1) $(call gb_Output_announce,$(2),$(true),RC ,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\

5
solenv/gbuild/platform/com_MSC_defs.mk
View File

@@ -190,6 +190,11 @@ ifeq ($(VCVER),100)
endif 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 # C4005: 'identifier' : macro redefinition
gb_PCHWARNINGS = \ gb_PCHWARNINGS = \