vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon May 30 
10:30:17 2011 +0200| [e834f5fccc141f46c3c0fbb7ad860c0d815289c8] | committer: 
Jean-Baptiste Kempf

OpenGL: fix Win32 compilation

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

 modules/video_output/opengl.c |    4 ----
 modules/video_output/opengl.h |    3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 345d8a8..6c15176 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -41,12 +41,8 @@
 # elif USE_OPENGL_ES == 1
 #  include <GLES/glext.h>
 # else
-# if defined(WIN32)
-#   include <GL/glew.h>
-# else
 #   include <GL/glext.h>
 # endif
-# endif
 #else
 # if USE_OPENGL_ES == 2
 #  include <OpenGLES/ES2/gl.h>
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 814754d..3c9e984 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -40,6 +40,9 @@
 # elif USE_OPENGL_ES == 1
 #  include <GLES/gl.h>
 # else
+#  ifdef WIN32
+#   include <GL/glew.h>
+#  endif
 #  include <GL/gl.h>
 # endif
 #else

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to