diff options
| author | Ptyl Dragon <ptyl@cloudon.com> | 2014-09-30 12:41:02 +0300 |
|---|---|---|
| committer | Ptyl Dragon <ptyl@cloudon.com> | 2014-09-30 12:41:24 +0300 |
| commit | 1f0f900c08f25b1804ad46fb54150a2862b09f1d (patch) | |
| tree | 8d8ff81dab09f9a69ad7d5e657e55ba638d13b8c | |
| parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) | |
Added flag --enable-vgl mapped to HAVE_VCL_OPEN_GL_BACKEND
feature/vcl-opengl
| -rw-r--r-- | config_host/config_features.h.in | 5 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | ios/experimental/TiledLibreOffice/.gitignore | 9 |
3 files changed, 23 insertions, 0 deletions
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index 04dc7ba520f8..9c97eb56cc9f 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -136,4 +136,9 @@ */ #define HAVE_FEATURE_COLLADA 0 +/* + * Whether VCL renders using Open GL. + */ +#define HAVE_VCL_OPEN_GL_BACKEND 0 + #endif diff --git a/configure.ac b/configure.ac index d58df767ae73..45869a0aa692 100644 --- a/configure.ac +++ b/configure.ac @@ -1222,6 +1222,11 @@ AC_ARG_ENABLE(vlc, [Enable building with the VLC avmedia backend.]), ,enable_vlc=no) +AC_ARG_ENABLE(vgl, + AS_HELP_STRING([--enable-vgl], + [Enable building with the VCL Open GL backend.]), +,enable_vgl=no) + AC_ARG_ENABLE(neon, AS_HELP_STRING([--disable-neon], [Disable neon and the compilation of webdav binding.]), @@ -2442,6 +2447,10 @@ if test $_os != iOS -a $_os != Android; then AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT) fi +if test "$enable_vgl" == yes; then + AC_DEFINE(HAVE_VCL_OPEN_GL_BACKEND) +fi + DISABLE_EXPORT='' if test "$enable_export" != no; then BUILD_TYPE="$BUILD_TYPE EXPORT" diff --git a/ios/experimental/TiledLibreOffice/.gitignore b/ios/experimental/TiledLibreOffice/.gitignore new file mode 100644 index 000000000000..a8966da9f956 --- /dev/null +++ b/ios/experimental/TiledLibreOffice/.gitignore @@ -0,0 +1,9 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +/Resources |