diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-30 09:08:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-30 09:08:32 +0200 |
| commit | 2428e1164b5f38da9fc2f24c5bb478e548f54a6f (patch) | |
| tree | 9b40fb44792c4fcde27a37708fcdc4496bd6b1bf | |
| parent | Related: tdf#65642 RTF filter: import \pgnlcltr (diff) | |
| download | core-2428e1164b5f38da9fc2f24c5bb478e548f54a6f.tar.gz core-2428e1164b5f38da9fc2f24c5bb478e548f54a6f.zip | |
Fix Android build
Change-Id: I7247f19b03302b2270e0f6f32c6e6b6e760fd7bd
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8df085b1c36a..af22fe2bc576 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -183,7 +183,7 @@ endef endif # SYSTEM_CPPUNIT -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),TRUE) ifneq ($(SYSTEM_GLEW),) define gb_LinkTarget__use_glew diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 61661382855b..30b86df09df5 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::frame; namespace { -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) static char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments"; static char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments"; @@ -100,7 +100,7 @@ namespace desktop namespace { -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) class Parser: public CommandLineArgs::Supplier { public: diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 1fb4f9be04a5..9ad1a09ff56e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -613,7 +613,7 @@ public: * the underlying SalGraphics and it's implementation * changing. */ -#if HAVE_FEATURE_OPENGL +#if HAVE_FEATURE_OPENGL || defined(ANDROID) class PaintScope { void *pHandle; public: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0592dd5f77a8..1d4cf3707114 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -120,7 +120,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ lcms2 \ mdds_headers \ )) -ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),TRUE) $(eval $(call gb_Library_use_externals,vcl,\ glew \ )) |