[Libreoffice-commits] .: vcl/Library_vcl.mk

Tor Lillqvist tml at kemper.freedesktop.org
Wed Jun 13 03:16:26 PDT 2012


 vcl/Library_vcl.mk |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 2e16eaf31c7a4849110020aebd5fbc97a1ab3e99
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Jun 13 13:14:41 2012 +0300

    Need basebmp headers unconditionally
    
    Change-Id: I47f15178ffa910c60acb56a7df749db0b1efec55

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 69c1faa..cf09be5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -317,15 +317,11 @@ $(eval $(call gb_Library_use_external,vcl,cairo))
 
 endif
 
-# GUIBASE specific stuff
-
-ifneq ($(filter headless android,$(GUIBASE)),)
-# even in the case we do not link with basebmp, we still need the headers
-# for some typedefs or enums
 $(eval $(call gb_Library_use_packages,vcl,\
 	basebmp_inc \
 ))
-endif
+
+# GUIBASE specific stuff
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\


More information about the Libreoffice-commits mailing list