From b1e4d856d2d3dfc497c5a2f1fb3f6f8ef7e36d87 Mon Sep 17 00:00:00 2001 From: Andrzej Hunt Date: Sat, 17 May 2014 11:31:16 +0100 Subject: Don't build svdemo for Android and iOS. f89296db5959cf009668f8aad85cfd860b9252ee adds building of svdemo, this however uses SAL_IMPLEMENT_MAIN from include/sal/main.h -- which specifically can't be built on Android and iOS, hence we shouldn't build svdemo for those platforms. Change-Id: I6ce851ece90837112279c89467326b82f7a2070b Reviewed-on: https://gerrit.libreoffice.org/9391 Tested-by: Michael Stahl Reviewed-by: Michael Stahl --- Repository.mk | 2 +- vcl/Module_vcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index 318654b4d70b..53049acc14f5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -118,7 +118,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ unopkg \ unopkg_com \ ) \ - svdemo \ + $(if $(filter-out ANDROID IOS,$(OS)),svdemo) \ )) $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index dc8130d97432..35a08bbb85f7 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer) \ - Executable_svdemo \ + $(if $(filter-out ANDROID IOS,$(OS)),Executable_svdemo) \ Library_vclopengl \ )) -- cgit