d3dvideosink: Fix linking
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 22 Dec 2012 11:05:14 +0000 (12:05 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 22 Dec 2012 11:05:14 +0000 (12:05 +0100)
configure.ac
sys/d3dvideosink/Makefile.am

index 55cbfc7..a3acfa1 100644 (file)
@@ -530,7 +530,7 @@ AG_GST_CHECK_FEATURE(DIRECT3D, [Direct3D plug-in], direct3dsink, [
   LIBS=$save_LIBS
 
   if test "x$HAVE_DIRECT3D" = "xyes";  then
-    DIRECT3D_LIBS="-lgdi32"
+    DIRECT3D_LIBS="-ld3d9 -lgdi32"
     AC_SUBST(DIRECT3D_LIBS)
   fi
   AC_SUBST(HAVE_DIRECT3D)
index 581df03..69c78d5 100644 (file)
@@ -1,11 +1,11 @@
 plugin_LTLIBRARIES = libgstd3dvideosink.la
 
 libgstd3dvideosink_la_SOURCES = d3dvideosink.c d3dhelpers.c
-libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIRECTX_CFLAGS)
+libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIRECT3D_CFLAGS) $(DIRECTX_CFLAGS)
 libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
        -lgstvideo-$(GST_API_VERSION) \
-       $(DIRECT3D_LIBS)
-libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFAGS) -e D3dDllMain
+       $(DIRECT3D_LIBS) $(DIRECTX_LDFAGS)
+libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = d3dvideosink.h d3dhelpers.h