add gstreamer libraries to EXTRALIBS_MEDIA which is only used for GUI programs, but not for wxBase (which avoids dependency on a whole bunch of GUI libraries in console applications)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
4
configure
vendored
4
configure
vendored
@@ -46154,7 +46154,7 @@ fi
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
|
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
|
||||||
LIBS="$GST_LIBS $LIBS"
|
EXTRALIBS_MEDIA="$GST_LIBS"
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define wxUSE_GSTREAMER 1
|
#define wxUSE_GSTREAMER 1
|
||||||
@@ -46327,7 +46327,7 @@ EXTRALIBS_XML="$EXPAT_LINK"
|
|||||||
EXTRALIBS_HTML="$MSPACK_LINK"
|
EXTRALIBS_HTML="$MSPACK_LINK"
|
||||||
EXTRALIBS_ODBC="$ODBC_LINK"
|
EXTRALIBS_ODBC="$ODBC_LINK"
|
||||||
if test "$wxUSE_GUI" = "yes"; then
|
if test "$wxUSE_GUI" = "yes"; then
|
||||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
|
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_MEDIA`
|
||||||
fi
|
fi
|
||||||
if test "$wxUSE_OPENGL" = "yes"; then
|
if test "$wxUSE_OPENGL" = "yes"; then
|
||||||
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
|
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
|
||||||
|
@@ -7682,7 +7682,7 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
|
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
|
||||||
LIBS="$GST_LIBS $LIBS"
|
EXTRALIBS_MEDIA="$GST_LIBS"
|
||||||
|
|
||||||
AC_DEFINE(wxUSE_GSTREAMER)
|
AC_DEFINE(wxUSE_GSTREAMER)
|
||||||
else
|
else
|
||||||
@@ -7906,7 +7906,7 @@ EXTRALIBS_XML="$EXPAT_LINK"
|
|||||||
EXTRALIBS_HTML="$MSPACK_LINK"
|
EXTRALIBS_HTML="$MSPACK_LINK"
|
||||||
EXTRALIBS_ODBC="$ODBC_LINK"
|
EXTRALIBS_ODBC="$ODBC_LINK"
|
||||||
if test "$wxUSE_GUI" = "yes"; then
|
if test "$wxUSE_GUI" = "yes"; then
|
||||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
|
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_MEDIA`
|
||||||
fi
|
fi
|
||||||
if test "$wxUSE_OPENGL" = "yes"; then
|
if test "$wxUSE_OPENGL" = "yes"; then
|
||||||
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
|
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
|
||||||
|
Reference in New Issue
Block a user