Repository.mk | 2 +- bin/lo-all-static-libs | 1 + vcl/Module_vcl.mk | 2 +- vcl/source/opengl/OpenGLContext.cxx | 12 ++++++++++-- 4 files changed, 13 insertions(+), 4 deletions(-)
New commits: commit b5e1693fe70f6b90120d367c3a8b4c46fe874a69 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Apr 8 16:59:56 2014 +0300 The GLEW lib, too Change-Id: Ic0a9ed4aa95418fdc1a2e49419eb2a2482351232 diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 1c9af5a..e1d6e0d 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -45,6 +45,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $androidlibs \ + $WORKDIR/UnpackedTarball/glew/lib/*.a \ $WORKDIR/UnpackedTarball/icu/source/lib/*.a \ $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \ $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \ commit 7232a2d520100184d5ca8264551ec0bc352971e7 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Apr 8 16:50:48 2014 +0300 Make libvclopengl build for iOS Change-Id: Id338d1fb8a1334fb4e984aff9494bab7f3c35dc1 diff --git a/Repository.mk b/Repository.mk index e18ecc2..7d1da27 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 fb5d04b..a5b0b32 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 29ac4d7..bd8065a 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() { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits