vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon May 16 16:00:18 2016 +0200| [ab5b088b81bfe14b7f066ca20d49b1df273a710d] | committer: Jean-Baptiste Kempf
Configure: remove HAVE_DIRECTX > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab5b088b81bfe14b7f066ca20d49b1df273a710d --- configure.ac | 6 +----- modules/video_output/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 2ab4802..87d7c6b 100644 --- a/configure.ac +++ b/configure.ac @@ -3317,13 +3317,10 @@ AC_ARG_ENABLE(directx, enable_directx="no" ]) ]) -have_directx="no" AS_IF([test "${enable_directx}" != "no"], [ dnl DirectDraw AC_CHECK_HEADERS(ddraw.h, [ - have_directx="yes" - ], [ - AC_MSG_ERROR([Cannot find DirectX headers!]) + VLC_ADD_PLUGIN([directdraw]) ]) dnl OpenGL @@ -3349,7 +3346,6 @@ AS_IF([test "${enable_directx}" != "no"], [ VLC_ADD_PLUGIN([direct2d]) ]) ]) -AM_CONDITIONAL([HAVE_DIRECTX], [test "$have_directx" = "yes"]) dnl dnl Linux framebuffer module diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 3e3333e..be2e16a 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -209,7 +209,8 @@ libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_directdraw libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid if HAVE_WIN32_DESKTOP -vout_LTLIBRARIES += libdirectdraw_plugin.la +vout_LTLIBRARIES += $(LTLIBdirectdraw) +EXTRA_LTLIBRARIES += libdirectdraw_plugin.la endif libglwin32_plugin_la_SOURCES = video_output/win32/glwin32.c \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
