configure: include glew.h before wglew.h

In recent wglew.h it relies on the DLL export mode defined in glew.h

(cherry picked from commit 1f86df44e3) (edited)
edited:
- the 3.0 converter is not in direct3d9.c

configure.ac

@@ -3469,12 +3469,15 @@ AS_IF([test "${enable_directx}" != "no"], [
   ])
 
   dnl OpenGL
-  AC_CHECK_HEADERS(GL/wglew.h, [
-    VLC_ADD_PLUGIN([glwin32 wgl])
-  ],, [
-    #include <windows.h>
-    #include <GL/gl.h>
-  ])
+  AC_CHECK_HEADERS([GL/glew.h], [
+    AC_CHECK_HEADERS(GL/wglew.h, [
+        VLC_ADD_PLUGIN([glwin32 wgl])
+      ],, [
+        #include <windows.h>
+        #include <GL/glew.h>
+      ])],, [
+      #include <windows.h>
+   ])
 
   dnl Direct3D11
   AC_CHECK_HEADERS(d3d11.h, [

modules/video_output/opengl/converter.h

@@ -45,7 +45,7 @@
 #  include <GLES2/gl2.h>
 #  include <GLES2/gl2ext.h>
 # else
-#  ifdef _WIN32
+#  ifdef HAVE_GL_WGLEW_H
 #   include <GL/glew.h>
 #  endif
 #  include <GL/gl.h>

modules/video_output/win32/glwin32.c

@@ -35,6 +35,7 @@
 
 #define GLEW_STATIC
 #include "../opengl/vout_helper.h"
+#include <GL/glew.h>
 #include <GL/wglew.h>
 
 #include "common.h"

modules/video_output/win32/wgl.c

@@ -29,6 +29,7 @@
 #include <vlc_opengl.h>
 
 #include "../opengl/vout_helper.h"
+#include <GL/glew.h>
 #include <GL/wglew.h>
 
 #include "common.h"