mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 20:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: Rename all variables related to the winks plugin

Browse source 
It does not make sense to call them after directshow if they
are for the winks plugin only.

https://bugzilla.gnome.org/show_bug.cgi?id=724100
This commit is contained in:
Sebastian Dröge 2014-02-16 10:09:18 +01:00
parent 99feef2d08
commit 22b4223c86
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
configure.ac
View file

@ -798,17 +798,17 @@ AG_GST_CHECK_FEATURE(WINSCREENCAP, [winscreencap plug-in], winscreencap, [
AC_SUBST(HAVE_WINSCREENCAP)
])
dnl DirectShow
translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTSHOW, true)
AG_GST_CHECK_FEATURE(DIRECTSHOW, [DirectShow plug-in], winks, [
HAVE_DIRECTSHOW="no"
dnl winks
translit(dnm, m, l) AM_CONDITIONAL(USE_WINKS, true)
AG_GST_CHECK_FEATURE(WINKS, [Winks plug-in], winks, [
HAVE_WINKS="no"
save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $DIRECTX_CFLAGS"
LDFLAGS="$LDFLAGS $DIRECTX_LDFLAGS"
LIBS="$LIBS -lole32 -luuid -lstrmiids"
AC_MSG_CHECKING(for DirectShow LDFLAGS)
AC_MSG_CHECKING(for Winks LDFLAGS)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <windows.h>
#include <strmif.h>
@ -823,21 +823,21 @@ int main () {
return 0;
}
]])],
[HAVE_DIRECTSHOW="yes"],
[HAVE_DIRECTSHOW="no"])
AC_MSG_RESULT($HAVE_DIRECTSHOW)
[HAVE_WINKS="yes"],
[HAVE_WINKS="no"])
AC_MSG_RESULT($HAVE_WINKS)
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
if test "x$HAVE_DIRECTSHOW" = "xyes"; then
if test "x$HAVE_WINKS" = "xyes"; then
dnl this is much more than we want
DIRECTSHOW_LIBS="-ldxguid -lole32 -luuid -lstrmiids -lksuser -lsetupapi"
WINKS_LIBS="-ldxguid -lole32 -luuid -lstrmiids -lksuser -lsetupapi"
AC_SUBST(DIRECTX_CFLAGS)
AC_SUBST(DIRECTX_LDFLAGS)
AC_SUBST(DIRECTSHOW_LIBS)
AC_SUBST(WINKS_LIBS)
fi
AC_SUBST(HAVE_DIRECTSHOW)
AC_SUBST(HAVE_WINKS)
])
dnl *** Android Media ***

8
sys/Makefile.am
View file

@ -58,10 +58,10 @@ else
DIRECTDRAW_DIR=
endif
if USE_DIRECTSHOW
DIRECTSHOW_DIR=winks
if USE_WINKS
WINKS_DIR=winks
else
DIRECTSHOW_DIR=
WINKS_DIR=
endif
if USE_DIRECTSOUND
@ -166,7 +166,7 @@ else
MFC_DIR=
endif
SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DIRECTSHOW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OPENSLES_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR) $(MFC_DIR)
SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(WINKS_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OPENSLES_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR) $(MFC_DIR)
DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia applemedia-nonpublic avc bluez d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
opensles osxvideo pvr2d qtwrapper shm uvch264 vcd vdpau wasapi wininet winks winscreencap mfc

2
sys/winks/Makefile.am
View file

@ -9,7 +9,7 @@ libgstwinks_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS)
libgstwinks_la_LIBADD = \
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR) $(DIRECTX_LDFLAGS) $(DIRECTSHOW_LIBS)
-lgstinterfaces-$(GST_MAJORMINOR) $(DIRECTX_LDFLAGS) $(WINKS_LIBS)
libgstwinks_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstwinks_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)