Commit 7a9193bb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Fix configure for Win32 on OpenGL detection

glwin32 should be back
parent 97c36f8d
...@@ -3271,20 +3271,24 @@ fi ...@@ -3271,20 +3271,24 @@ fi
AC_ARG_ENABLE(directx, AC_ARG_ENABLE(directx,
[ --enable-directx Win32 DirectX support (default enabled on Win32)]) [ --enable-directx Win32 DirectX support (default enabled on Win32)])
if test "${enable_directx}" != "no" if test "${enable_directx}" != "no"; then
then if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" dnl DDraw
then
VLC_ADD_LIBS([directx],[-luser32])
AC_CHECK_HEADERS(ddraw.h, AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGIN([directx aout_directx]) [ VLC_ADD_PLUGIN([directx aout_directx])
VLC_ADD_LIBS([directx],[-lgdi32]) VLC_ADD_LIBS([directx],[-luser32 -lgdi32])
],[AC_MSG_ERROR([Cannot find DirectX headers!])] ],[AC_MSG_ERROR([Cannot find DirectX headers!])]
) )
dnl OpenGL
AC_CHECK_HEADERS(GL/glext.h, AC_CHECK_HEADERS(GL/glext.h,
[ VLC_ADD_PLUGIN([glwin32]) [ VLC_ADD_PLUGIN([glwin32])
VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
],[],[
#include <GL/gl.h>
]) ])
dnl Direct3D
AC_CHECK_HEADERS(d3d9.h, AC_CHECK_HEADERS(d3d9.h,
[ VLC_ADD_PLUGIN([direct3d]) [ VLC_ADD_PLUGIN([direct3d])
VLC_ADD_LIBS([direct3d],[-lgdi32]) VLC_ADD_LIBS([direct3d],[-lgdi32])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment