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

Luboš Luňák l.lunak at suse.cz
Thu Mar 21 04:27:20 PDT 2013


 solenv/gbuild/WinResTarget.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27388c9483b5e00b593ac126092c5bbb131492b0
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 21 12:26:15 2013 +0100

    do not pass -isystem to winres
    
    In mingw build, the compiler is gcc, so -isystem is supported, but winres
    is passed some include flags too and there -isystem should be turned back to -I.

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 268a9e7..48d5b72 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -13,7 +13,7 @@ endef
 
 define gb_WinResTarget_WinResTarget_init
 $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) -I$(SRCDIR)/config_$(gb_Side)
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(SRCDIR)/config_$(gb_Side)
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
 


More information about the Libreoffice-commits mailing list