Repository.mk | 2 +-
avmedia/Module_avmedia.mk | 2 +-
configure.ac | 7 +++++--
postprocess/Rdb_services.mk | 4 +++-
4 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit f333d58e73ac39b48ae655fd9e123a4ca77f1562
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Sat Apr 19 18:04:24 2014 +0200
Introduce a new building flag to enable/disable gltf support
Enable it by defautl excepting android and ios.
Change-Id: I7798661ad7e470ad1eb91060ec21ba1de3979a4b
diff --git a/configure.ac b/configure.ac
index 49ca49a..63a60da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1366,6 +1366,10 @@ AC_ARG_ENABLE(library-bin-tar,
for the next time.]),
)
+AC_ARG_ENABLE(gltf,
+ AS_HELP_STRING([--disable-gltf],
+ [Determines whether to build libraries related to glTF 3D model
rendering.]))
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@ -10364,7 +10368,7 @@ dnl
===================================================================
ENABLE_GLTF=
AC_MSG_CHECKING([whether to enable glTF support])
-if test "$enable_opengl" = "yes"; then
+if test $_os != iOS -a $_os != Android -a "x$enable_gltf" != "xno"; then
ENABLE_GLTF=TRUE
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE LIBGLTF"
commit cda58f93811a932a4cd28cedfd6606a01d03e89d
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Sat Apr 19 17:40:16 2014 +0200
configure.ac: remove duplicated flag
Change-Id: I95ee315fe1c10ae95ea0fe940eca4c06a6326447
diff --git a/configure.ac b/configure.ac
index 693d102..49ca49a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7334,7 +7334,6 @@ if test $_os = iOS; then
enable_coinmp=no
enable_lpsolve=no
enable_postgresql_sdbc=no
- enable_lotuswordpro=no
enable_extension_integration=no
enable_report_builder=no
with_theme="tango"
commit 5f6fd413a301d58c50ccb1b7558d78477e0105df
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Sat Apr 19 17:32:31 2014 +0200
avmediaogl: build depends on ENABLE_GLTF instead
Change-Id: I03d0d7c0446b6316e388ae717aded6bb7dcc88f1
diff --git a/Repository.mk b/Repository.mk
index e255636..e8412a2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -500,7 +500,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_GSTREAMER),avmediagst) \
$(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(ENABLE_DIRECTX),avmediawin) \
- $(if $(ENABLE_OPENGL),avmediaogl) \
+ $(if $(ENABLE_GLTF),avmediaogl) \
cached1 \
collator_data \
comphelper \
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index b1b6703..4a80ad9 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
))
endif
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_GLTF),TRUE)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaogl \
))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 8053b7d..5a4b104 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -218,7 +218,6 @@ $(eval $(call gb_Rdb_add_components,services,\
) \
$(if $(ENABLE_OPENGL), \
slideshow/source/engine/OGLTrans/ogltrans \
- $(call
gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
) \
$(if $(ENABLE_TDE), \
shell/source/backends/kdebe/tdebe1 \
@@ -233,6 +232,9 @@ $(eval $(call gb_Rdb_add_components,services,\
wizards/com/sun/star/wizards/report/report \
wizards/com/sun/star/wizards/table/table \
) \
+ $(if $(ENABLE_GLTF), \
+ $(call
gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
+ ) \
))
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
