diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-04-24 11:26:33 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-24 09:34:27 +0000 |
| commit | e0c8cfd2ac753a5c557f5960889bf35085747b2e (patch) | |
| tree | fc9bd25e6434c1d671e159b0f4bf170e976f1f43 /solenv/gbuild | |
| parent | bb01340a5ccd07a29cce27c8e6cf0664a34aacfe (diff) | |
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
ae4e327739112ba326a2945fc0d5550739f3083d and follow-up ones.
Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a
Reviewed-on: https://gerrit.libreoffice.org/3593
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/WinResTarget.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index d88375e65397..bb59d24896fa 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -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)) |