projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b487ef
)
gl/cocoa: include gl3.h to have GL_CONTEXT_PROFILE_MASK
author
Julien Isorce
<julien.isorce@gmail.com>
Mon, 3 Nov 2014 23:08:09 +0000
(23:08 +0000)
committer
Julien Isorce
<julien.isorce@gmail.com>
Mon, 3 Nov 2014 23:08:09 +0000
(23:08 +0000)
gst-libs/gst/gl/gstglapi.h
patch
|
blob
|
history
diff --git
a/gst-libs/gst/gl/gstglapi.h
b/gst-libs/gst/gl/gstglapi.h
index fa6831ec7052a9ed886cf2326b4818c2a36aa94f..d46a5f5b3d39d640e034c55d1a9a166c6bb6e267 100644
(file)
--- a/
gst-libs/gst/gl/gstglapi.h
+++ b/
gst-libs/gst/gl/gstglapi.h
@@
-70,6
+70,10
@@
# ifdef __APPLE__
# include <OpenGL/OpenGL.h>
# include <OpenGL/gl.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+# define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
+# include <OpenGL/gl3.h>
+# endif
# include <OpenGL/glu.h>
# else
# include <GL/gl.h>