summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorIsamu Mogi <saturday6c@gmail.com>2013-06-01 14:11:07 +0000
committerLuboš Luňák <l.lunak@suse.cz>2013-06-04 14:31:56 +0000
commit2f912c2937ff47d0af753420fcb9a16584c4f56d (patch)
treeb7c3a184c3498291738501ea76dd08cb1497d4ea /solenv
parent25bb9d13b259dbfb73f1412506f0d051b3670089 (diff)
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@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/WinResTarget.mk2
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk3
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk3
3 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 90d8d51e375b..0508bde11930 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 3fe9b0d718fd..77632c5a6f44 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 fc63eba7c2ce..10cfc414fa20 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)