diff options
author | Rene Engelhard <rene@debian.org> | 2014-08-05 20:05:35 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-29 14:05:19 +0200 |
commit | 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 (patch) | |
tree | 0ecb0396b1eec8f05092af6e98117d5d044355d1 | |
parent | 671083ca561345a202383f940c0456edba03c318 (diff) |
implement --with-system-gltf
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
(cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb)
-rw-r--r-- | RepositoryExternal.mk | 18 | ||||
-rw-r--r-- | avmedia/source/opengl/oglframegrabber.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/opengl/oglplayer.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/opengl/oglwindow.hxx | 4 | ||||
-rw-r--r-- | config_host.mk.in | 3 | ||||
-rw-r--r-- | configure.ac | 15 |
6 files changed, 47 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ff5059851999..b42dce252f53 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3281,6 +3281,8 @@ endif # DESKTOP ifeq ($(ENABLE_GLTF),TRUE) +ifneq ($(SYSTEM_LIBGLTF),TRUE) + define gb_LinkTarget__use_libgltf $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \ @@ -3306,6 +3308,22 @@ $(call gb_ExternalProject_use_external_project,$(1),libgltf) endef +else # SYSTEM_LIBGLTF + +define gb_LinkTarget__use_libgltf +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBGLTF_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS)) +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_LIBGLTF \ +) + +endef + +endif # SYSTEN_LIBGLTF + define gb_LinkTarget__use_opencollada_parser $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx index 5beb15bcf308..0d382246fd29 100644 --- a/avmedia/source/opengl/oglframegrabber.hxx +++ b/avmedia/source/opengl/oglframegrabber.hxx @@ -14,7 +14,11 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XFrameGrabber.hpp> +#ifdef SYSTEM_LIBGLTF +#include <libgltf/libgltf.h> +#else #include <libgltf.h> +#endif namespace avmedia { namespace ogl { diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 03ad515a52cc..52aa395da4ca 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -14,7 +14,11 @@ #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XPlayer.hpp> +#ifdef SYSTEM_LIBGLTF +#include <libgltf/libgltf.h> +#else #include <libgltf.h> +#endif #include <vcl/opengl/OpenGLContext.hxx> #include <vcl/timer.hxx> diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index a68f667b0be9..ae86083026d3 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -17,7 +17,11 @@ #include <com/sun/star/media/XPlayerWindow.hpp> #include <com/sun/star/media/ZoomLevel.hpp> +#ifdef SYSTEM_LIBGLTF +#include <libgltf/libgltf.h> +#else #include <libgltf.h> +#endif #include <vcl/opengl/OpenGLContext.hxx> #include <vcl/syschild.hxx> diff --git a/config_host.mk.in b/config_host.mk.in index b7e5b6c3563d..aec0fa5dd429 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -127,6 +127,9 @@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ export ENABLE_ORCUS=@ENABLE_ORCUS@ export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@ export ENABLE_GLTF=@ENABLE_GLTF@ +export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@ +export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@ +export LIBGLTF_LIBS=@LIBGLTF_LIBS@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ export ENABLE_GTK3=@ENABLE_GTK3@ diff --git a/configure.ac b/configure.ac index 02791cab2fc9..63e067bb4e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -1552,6 +1552,11 @@ AC_ARG_WITH(system-jpeg, [Use jpeg already on system.]),, [with_system_jpeg=auto]) +AC_ARG_WITH(system-libgltf, + AS_HELP_STRING([--with-system-libgltf], + [Use libgltf already on system.]),, + [with_system_libgltf=auto]) + AC_ARG_WITH(system-clucene, AS_HELP_STRING([--with-system-clucene], [Use clucene already on system.]),, @@ -10561,7 +10566,12 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And ENABLE_GLTF=TRUE AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FEATURE_GLTF,1) - BUILD_TYPE="$BUILD_TYPE LIBGLTF" + if test "$with_system_libgltf" = "yes"; then + SYSTEM_LIBGLTF=TRUE + PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 ) + else + BUILD_TYPE="$BUILD_TYPE LIBGLTF" + fi # otherwise build fails in collada2gltf external because of std::shared_ptr if test "$have_std_shared_ptr" = "yes"; then BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" @@ -10570,6 +10580,9 @@ else AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_GLTF) +AC_SUBST(SYSTEM_LIBGLTF) +AC_SUBST(LIBGLTF_CFLAGS) +AC_SUBST(LIBGLTF_LIBS) # pdf import? AC_MSG_CHECKING([whether to build the PDF import feature]) |