[vlc-commits] vout/opengl: cleanup the Mac includes

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jun 30 14:46:05 2012 +0200| [b370fad7aa5814859577a9137cc26570f78345d7] | committer: Felix Paul Kühne

vout/opengl: cleanup the Mac includes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b370fad7aa5814859577a9137cc26570f78345d7
---

 modules/video_output/opengl.h |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 86758be..13645f3 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -29,18 +29,24 @@
 #include <vlc_picture_pool.h>
 #include <vlc_opengl.h>
 
-// Define USE_OPENGL_ES to the GL ES Version you want to select
-#ifndef USE_OPENGL_ES
-# define USE_OPENGL_ES 0
-#endif
-
 #ifdef __APPLE__
 # include "TargetConditionals.h"
-# if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
+# if defined(TARGET_OS_MAC)
+#  define MACOS_OPENGL
+#  include <OpenGL/gl.h>
+# else
 #  define USE_OPENGL_ES 1
+#  include <OpenGLES/ES1/gl.h>
+#  include <OpenGLES/ES2/gl.h>
+#  include <OpenGLES/ES2/glext.h>
 # endif
 #endif
 
+// Define USE_OPENGL_ES to the GL ES Version you want to select
+#ifndef USE_OPENGL_ES
+# define USE_OPENGL_ES 0
+#endif
+
 #if !defined (__APPLE__)
 # if USE_OPENGL_ES == 2
 #  include <GLES2/gl2.h>
@@ -54,15 +60,6 @@
 #  endif
 #  include <GL/gl.h>
 # endif
-#else
-# if !USE_OPENGL_ES
-#  define MACOS_OPENGL
-#  include <OpenGL/gl.h>
-# else
-#  include <OpenGLES/ES1/gl.h>
-#  include <OpenGLES/ES2/gl.h>
-#  include <OpenGLES/ES2/glext.h>
-# endif
 #endif
 
 static inline bool HasExtension(const char *apis, const char *api)