solenv/gbuild/WinResTarget.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e0c8cfd2ac753a5c557f5960889bf35085747b2e
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed Apr 24 11:26:33 2013 +0200
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 <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index d88375e..bb59d24 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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
