Kaydet (Commit) 2428e116 authored tarafından Miklos Vajna's avatar Miklos Vajna

Fix Android build

Change-Id: I7247f19b03302b2270e0f6f32c6e6b6e760fd7bd
üst 43a17602
......@@ -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
......
......@@ -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:
......
......@@ -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:
......
......@@ -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 \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment