mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3dvideosink: Fix configure check and makefiles

Browse source 
Fixes bug #652035.
This commit is contained in:
Raimo Järvi 2011-06-07 13:55:38 +03:00 committed by David Schleef
parent 40ee3369a0
commit 59aaf71b0b
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

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

2
sys/Makefile.am
View file

@ -113,7 +113,7 @@ else
AVC_DIR= AVC_DIR=
endif 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 \ 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 osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap

5
sys/d3dvideosink/Makefile.am
View file

@ -6,8 +6,9 @@ libgstd3dvideosink_la_SOURCES = d3dvideosink.c directx/d3d.c directx/dx.c \
directx/directx11/dx11.c directx/directx11/dx11_d3d.c directx/directx11/dx11.c directx/directx11/dx11_d3d.c
libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgdi32 $(DIRECT3D_LIBS)
libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = d3dvideosink.h directx/d3d.h directx/dx.h directx/directx.h \ noinst_HEADERS = d3dvideosink.h directx/d3d.h directx/dx.h directx/directx.h \