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 /avmedia | |
| parent | 671083ca561345a202383f940c0456edba03c318 (diff) | |
implement --with-system-gltf
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
(cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb)
Diffstat (limited to 'avmedia')
| -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 |
3 files changed, 12 insertions, 0 deletions
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> |