From 7f3aaf504b66dcbd088761b502161e262563f187 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Sat, 9 Mar 2013 21:59:02 +1100 Subject: [PATCH] [671/906] win32: #include GL/glext.h on windows also add some GL default variables if some GL types are not defined --- gst-libs/gst/gl/glprototypes/gstgl_compat.h | 38 +++++++++++++++++++++++++++++ gst-libs/gst/gl/gstglapi.h | 5 ++++ 2 files changed, 43 insertions(+) create mode 100644 gst-libs/gst/gl/glprototypes/gstgl_compat.h diff --git a/gst-libs/gst/gl/glprototypes/gstgl_compat.h b/gst-libs/gst/gl/glprototypes/gstgl_compat.h new file mode 100644 index 0000000..6271917 --- /dev/null +++ b/gst-libs/gst/gl/glprototypes/gstgl_compat.h @@ -0,0 +1,38 @@ + /* + * GStreamer + * Copyright (C) 2012 Matthew Waters + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_GL_COMPAT_H__ +#define __GST_GL_COMPAT_H__ + +/* undefined typedefs */ +#ifndef GLeglImageOES +typedef gpointer GLeglImageOES; +#endif +#ifndef GLchar +typedef gchar GLchar; +#endif +#ifndef GLsizeiptr +typedef ptrdiff_t GLsizeiptr; +#endif +#ifndef GLintptr +typedef ptrdiff_t GLintptr; +#endif + +#endif diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index e5e44fa..d416760 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -40,9 +40,14 @@ # else # include # include +# if __WIN32__ +# include +# endif # endif #endif +#include "glprototypes/gstgl_compat.h" + #include G_BEGIN_DECLS -- 2.7.4