RepositoryExternal.mk | 9 ++++++++- config_host.mk.in | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit a4835f66dd8335c9565af9d68630beadcba9a607 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 4 10:43:46 2014 +0100 Fix --with-system-glew Change-Id: I62d36ada2128b11955b50b0373e1404ff34f2bd0 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7e8bb35..0c48bf2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -128,7 +128,14 @@ endif ifeq ($(SYSTEM_GLEW),YES) -gb_LinkTarget__use_glew := +define gb_LinkTarget__use_glew +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(GLEW_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS)) + +endef else diff --git a/config_host.mk.in b/config_host.mk.in index c76b2ae..887cd0a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -196,6 +196,8 @@ export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@ export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@ export GIT_LINK_SRC=@GIT_LINK_SRC@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@ +export GLEW_CFLAGS=$(gb_SPACE)@GLEW_CFLAGS@ +export GLEW_LIBS=$(gb_SPACE)@GLEW_LIBS@ export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@ export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits