diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-11 14:19:41 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-11 14:20:13 +0000 |
| commit | 2371cf848378309f1a58fd44fc88903131b79d13 (patch) | |
| tree | b8c078bdfa6a6203efb379f341b6ac4e7342c767 | |
| parent | a210e027e6856b86d589d3b65b94060305127116 (diff) | |
winscreencap: Fix configure check and compilation
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | sys/winscreencap/Makefile.am | 4 |
2 files changed, 17 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index ecc7c7090..6d9d61d4f 100644 --- a/configure.ac +++ b/configure.ac @@ -573,23 +573,30 @@ AG_GST_CHECK_FEATURE(DIRECTDRAW, [DirectDraw plug-in], directdrawsink, [ dnl Direct3D9 AM_CONDITIONAL(USE_DIRECT3D9, true) AG_GST_CHECK_FEATURE(DIRECT3D9, [Direct3D9], winscreencap, [ - HAVE_DIRECT3D="no" - + HAVE_DIRECT3D9="no" + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" - + CFLAGS="$CFLAGS $DIRECTX_CFLAGS" + LDFLAGS="$LDFLAGS $DIRECTX_LDFLAGS" LIBS="$LIBS -ld3d9 -lgdi32" AC_MSG_CHECKING(for Direct3D9 LDFLAGS) - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + AC_LINK_IFELSE([ #include <windows.h> #include <d3d9.h> -]], [[ + +int main () +{ Direct3DCreate9(D3D_SDK_VERSION); -]])], + + return 0; +} +], [HAVE_DIRECT3D9="yes"], [HAVE_DIRECT3D9="no"]) AC_MSG_RESULT($HAVE_DIRECT3D9) - + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS LIBS=$save_LIBS if test "x$HAVE_DIRECT3D9" = "xyes"; then diff --git a/sys/winscreencap/Makefile.am b/sys/winscreencap/Makefile.am index 09d80d2c0..572a2ff0b 100644 --- a/sys/winscreencap/Makefile.am +++ b/sys/winscreencap/Makefile.am @@ -2,9 +2,9 @@ plugin_LTLIBRARIES = libgstwinscreencap.la libgstwinscreencap_la_SOURCES = gstdx9screencapsrc.c gstgdiscreencapsrc.c gstwinscreencap.c libgstwinscreencap_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) $(DIRECT3D9_CFLAGS) $(DIRECTX_CFLAGS) libgstwinscreencap_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - $(DIRECT3D9_LIBS) + $(DIRECT3D9_LIBS) $(DIRECTX_LDFLAGS) libgstwinscreencap_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwinscreencap_la_LIBTOOLFLAGS = --tag=disable-static |