diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-08 16:50:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-08 17:05:28 +0300 |
| commit | 7232a2d520100184d5ca8264551ec0bc352971e7 (patch) | |
| tree | 13fb56a11dcc1af69d0f3055e05c021829cdcc42 | |
| parent | d356395ec37a9ba06e0a6f1ddc150245e2b3898d (diff) | |
Make libvclopengl build for iOS
Change-Id: Id338d1fb8a1334fb4e984aff9494bab7f3c35dc1
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 12 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index e18ecc275264..7d1da27f0d72 100644 --- a/Repository.mk +++ b/Repository.mk @@ -352,7 +352,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ vclcanvas \ - $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \ + $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)),vclopengl) \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ vclplug_gen \ $(if $(ENABLE_TDE),vclplug_tde) \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index fb5d04b54608..a5b0b32d1e38 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) \ - $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \ + $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)), \ Library_vclopengl \ ) \ )) diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 29ac4d7c208b..bd8065aa77f8 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -308,7 +308,7 @@ debug_callback(GLenum source, GLenum type, GLuint id, #endif -#if defined UNX && !defined MACOSX +#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID namespace { @@ -342,6 +342,10 @@ bool OpenGLContext::init( Window* pParent ) m_aGLWin.hDC = GetDC(m_aGLWin.hWnd); #elif defined( MACOSX ) +#elif defined( IOS ) + +#elif defined( ANDROID ) + #elif defined( UNX ) m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy, m_aGLWin.vi, @@ -394,6 +398,10 @@ bool OpenGLContext::init( Window* pParent ) #elif defined( MACOSX ) +#elif defined( IOS ) + +#elif defined( ANDROID ) + #elif defined( UNX ) if( !glXMakeCurrent( m_aGLWin.dpy, m_aGLWin.win, m_aGLWin.ctx ) ) { @@ -554,7 +562,7 @@ bool OpenGLContext::initWindow() return true; } -#elif defined( MACOSX ) +#elif defined( MACOSX ) || defined( IOS) || defined( ANDROID ) bool OpenGLContext::initWindow() { |