From 25d92711bc5161223e95c5478696879161f0cf7e Mon Sep 17 00:00:00 2001 From: Dmitry Ketov Date: Wed, 14 Mar 2012 10:24:05 +0100 Subject: [PATCH] winscreencap: Integrate into autotools build system Fixes bug #672031. --- configure.ac | 30 ++++++++++++++++++++++++++++++ sys/winscreencap/Makefile.am | 15 +++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index b4993f95dd..37d7859d4c 100644 --- a/configure.ac +++ b/configure.ac @@ -528,6 +528,36 @@ AG_GST_CHECK_FEATURE(DIRECTDRAW, [DirectDraw plug-in], directdrawsink, [ AC_SUBST(HAVE_DIRECTDRAW) ]) +dnl Direct3D9 +AM_CONDITIONAL(USE_DIRECT3D9, true) +AG_GST_CHECK_FEATURE(DIRECT3D9, [Direct3D9], winscreencap, [ + HAVE_DIRECT3D="no" + + save_LIBS="$LIBS" + + LIBS="$LIBS -ld3d9 -lgdi32" + AC_MSG_CHECKING(for Direct3D9 LDFLAGS) + + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +#include +]], [[ + Direct3DCreate9(D3D_SDK_VERSION); +]])], + [HAVE_DIRECT3D9="yes"], + [HAVE_DIRECT3D9="no"]) + AC_MSG_RESULT($HAVE_DIRECT3D9) + + LIBS=$save_LIBS + + if test "x$HAVE_DIRECT3D9" = "xyes"; then + + DIRECT3D9_LIBS="-ld3d9 -lgdi32" + AC_SUBST(DIRECT3D9_LIBS) + fi + AC_SUBST(HAVE_DIRECT3D9) +]) + dnl *** AppleMedia (OS X and iOS) *** translit(dnm, m, l) AM_CONDITIONAL(USE_APPLE_MEDIA, true) HAVE_APPLE_MEDIA="no" diff --git a/sys/winscreencap/Makefile.am b/sys/winscreencap/Makefile.am index d14273b38a..09d80d2c08 100644 --- a/sys/winscreencap/Makefile.am +++ b/sys/winscreencap/Makefile.am @@ -1,8 +1,11 @@ -# This plugin isn't buildable with autotools at this point in time, so just -# ensure everything's listed in EXTRA_DIST +plugin_LTLIBRARIES = libgstwinscreencap.la -EXTRA_DIST = \ - gstdx9screencapsrc.c gstdx9screencapsrc.h \ - gstgdiscreencapsrc.c gstgdiscreencapsrc.h \ - gstwinscreencap.c gstwinscreencap.h +libgstwinscreencap_la_SOURCES = gstdx9screencapsrc.c gstgdiscreencapsrc.c gstwinscreencap.c +libgstwinscreencap_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) +libgstwinscreencap_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ + $(DIRECT3D9_LIBS) +libgstwinscreencap_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstwinscreencap_la_LIBTOOLFLAGS = --tag=disable-static +noinst_HEADERS= gstwinscreencap.h