RepositoryExternal.mk | 2 +- external/freetype/Module_freetype.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 9b9f1a5f0642a8ccffb67bd53dc18025f99950c7 Author: Zolnai Tamás <[email protected]> Date: Fri Apr 18 13:24:00 2014 +0200 Fix android build: fix condition Change-Id: I5e20375791f038b38ef079712204a1afed07c39c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c9e04fa..878d4b7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1254,7 +1254,7 @@ endef gb_ExternalProject__use_freetype := -else ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) +else ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index 9ff2582..f6e316d 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,freetype)) -ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) +ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
