[Libreoffice-commits] core.git: solenv/gbuild
Isamu Mogi
saturday6c at gmail.com
Tue Jun 4 07:32:16 PDT 2013
solenv/gbuild/WinResTarget.mk | 2 ++
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 3 +--
solenv/gbuild/platform/com_MSC_defs.mk | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2f912c2937ff47d0af753420fcb9a16584c4f56d
Author: Isamu Mogi <saturday6c at gmail.com>
Date: Sat Jun 1 14:11:07 2013 +0000
gbuild: Use gb_RCFLAGS
gb_RCFLAGS is defined. But it wasn't used anywhere.
Change-Id: Ib9c5ba85a7c72560a94829fde4eee8c73fad3c5a
Reviewed-on: https://gerrit.libreoffice.org/4125
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/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 90d8d51..0508bde 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -33,6 +33,7 @@ endef
define gb_WinResTarget_WinResTarget_init
$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
+$(call gb_WinResTarget_get_target,$(1)) : FLAGS := $(gb_RCFLAGS)
$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(BUILDDIR)/config_$(gb_Side)
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
@@ -41,6 +42,7 @@ $(call gb_WinResTarget_WinResTarget_platform,$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
+$(call gb_WinResTarget_get_dep_target,$(1)) : FLAGS := $$(gb_RCFLAGS)
$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(BUILDDIR)/config_$(gb_Side)
$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 3fe9b0d..77632c5 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -51,8 +51,7 @@ gb_RCDEFS := \
-DWINVER=0x0400 \
-DWIN32 \
-gb_RCFLAGS := \
- -V
+gb_RCFLAGS :=
gb_CFLAGS += \
$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index fc63eba..10cfc41 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -59,8 +59,7 @@ gb_RCDEFS := \
-DWINVER=0x0400 \
-DWIN32 \
-gb_RCFLAGS := \
- -V
+gb_RCFLAGS :=
gb_AFLAGS := $(AFLAGS)
More information about the Libreoffice-commits
mailing list