vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Fri Sep 30 10:42:17 2011 +0200| [7a9193bb0bf1bb9443b964381d3993c871775644] | committer: Jean-Baptiste Kempf
Fix configure for Win32 on OpenGL detection glwin32 should be back > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7a9193bb0bf1bb9443b964381d3993c871775644 --- configure.ac | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0f3a329..f703f92 100644 --- a/configure.ac +++ b/configure.ac @@ -3271,20 +3271,24 @@ fi AC_ARG_ENABLE(directx, [ --enable-directx Win32 DirectX support (default enabled on Win32)]) -if test "${enable_directx}" != "no" -then - if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" - then - VLC_ADD_LIBS([directx],[-luser32]) +if test "${enable_directx}" != "no"; then + if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then + dnl DDraw AC_CHECK_HEADERS(ddraw.h, [ VLC_ADD_PLUGIN([directx aout_directx]) - VLC_ADD_LIBS([directx],[-lgdi32]) + VLC_ADD_LIBS([directx],[-luser32 -lgdi32]) ],[AC_MSG_ERROR([Cannot find DirectX headers!])] ) + + dnl OpenGL AC_CHECK_HEADERS(GL/glext.h, [ VLC_ADD_PLUGIN([glwin32]) VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) + ],[],[ + #include <GL/gl.h> ]) + + dnl Direct3D AC_CHECK_HEADERS(d3d9.h, [ VLC_ADD_PLUGIN([direct3d]) VLC_ADD_LIBS([direct3d],[-lgdi32]) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits