d3dvideosink: Fix configure check and makefiles

Fixes bug #652035.

diff --git a/configure.ac b/configure.ac
index 4e41553884cd5b673444938418768e260b4e36b1..da0305baf81980473e7efa6228ce811204b1da28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -463,16 +463,15 @@ AG_GST_CHECK_FEATURE(DIRECT3D, [Direct3D plug-in], direct3dsink, [
   save_LIBS="$LIBS"
   CFLAGS="$CFLAGS $DIRECTX_CFLAGS"
   LDFLAGS="$LDFLAGS $DIRECTX_LDFLAGS"
-  LIBS="$LIBS -ld3d -lgdi32"
+  LIBS="$LIBS -ld3d9 -lgdi32"
   AC_MSG_CHECKING(for Direct3D LDFLAGS)
   AC_LINK_IFELSE([
 #include <windows.h>
-#include <d3d.h>
+#include <d3d9.h>
 
 int main ()
 {
-  GetStockObject(0);
-  Direct3DCreate(NULL, NULL, NULL);
+  Direct3DCreate9(D3D_SDK_VERSION);
 
   return 0;
 }
@@ -485,8 +484,7 @@ int main ()
   LIBS=$save_LIBS
 
   if test "x$HAVE_DIRECT3D" = "xyes";  then
-    dnl this is much more than we want
-    DIRECT3D_LIBS="-ld3d -ldxguid -lgdi32"
+    DIRECT3D_LIBS="-lgdi32"
     AC_SUBST(DIRECT3D_LIBS)
   fi
   AC_SUBST(HAVE_DIRECT3D)

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 89e898d0ac84c092a53df975fea45cbea21dd807..5df060c861973ad40d3b506f1c4876db7f1e3f9b 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -113,7 +113,7 @@ else
 AVC_DIR=
 endif
 
-SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR)
+SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR)
 
 DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
                osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap

diff --git a/sys/d3dvideosink/Makefile.am b/sys/d3dvideosink/Makefile.am
index 6e0ecf316c8134b178edac72f3528620c8d9513e..183e460cf68d7da934a40c545206d2ecc05f0b34 100644 (file)
--- a/sys/d3dvideosink/Makefile.am
+++ b/sys/d3dvideosink/Makefile.am
@@ -6,8 +6,9 @@ libgstd3dvideosink_la_SOURCES = d3dvideosink.c directx/d3d.c directx/dx.c \
        directx/directx11/dx11.c directx/directx11/dx11_d3d.c
 libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
 libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-       -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
-libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgdi32
+       -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+       $(DIRECT3D_LIBS)
+libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = d3dvideosink.h directx/d3d.h directx/dx.h directx/directx.h \