Kaydet (Commit) e0c8cfd2 authored tarafından Christian Lohmaier's avatar Christian Lohmaier Kaydeden (comit) Fridrich Strba

allow out-of-srctree builds on windows

config_host (config_$(gb_Side) dir was included from SRCDIR, but when
runing the build in another directory, it is in BUILDDIR
WinResTarget.mk was forgotten when the other references were updated in
ae4e3277 and follow-up ones.

Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a
Reviewed-on: https://gerrit.libreoffice.org/3593Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst bb01340a
......@@ -16,7 +16,7 @@ endef
define gb_WinResTarget_WinResTarget_init
$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(SRCDIR)/config_$(gb_Side)
$(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 :=
......@@ -24,7 +24,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)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side)
$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(BUILDDIR)/config_$(gb_Side)
$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
-include $(call gb_WinResTarget_get_dep_target,$(1))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment