avmedia: vlc - with the wrapper we no longer need cflags / libs.
Change-Id: I824aa1e7908acefe898b7f24b323426f1cce250c
This commit is contained in:
@@ -14,9 +14,7 @@ $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmedia
|
||||
$(eval $(call gb_Library_set_include,avmediavlc,\
|
||||
$$(INCLUDE) \
|
||||
-I$(SRCDIR)/avmedia/source/inc \
|
||||
$(VLC_CFLAGS) \
|
||||
))
|
||||
$(eval $(call gb_Library_add_libs,avmediavlc,$(VLC_LIBS)))
|
||||
|
||||
$(eval $(call gb_Library_use_external,avmediavlc,boost_headers))
|
||||
|
||||
|
@@ -556,8 +556,6 @@ export VCVER=@VCVER@
|
||||
export VERBOSE=@VERBOSE@
|
||||
export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@
|
||||
export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@
|
||||
export VLC_CFLAGS=@VLC_CFLAGS@
|
||||
export VLC_LIBS=@VLC_LIBS@
|
||||
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
|
||||
export WGET=@WGET@
|
||||
export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@
|
||||
|
@@ -10088,18 +10088,14 @@ dnl ===================================================================
|
||||
ENABLE_VLC=""
|
||||
|
||||
if test "$build_gstreamer" = "yes"; then
|
||||
|
||||
AC_MSG_CHECKING([whether to enable the new VLC avmedia backend])
|
||||
if test "x$enable_vlc" != "xno"; then
|
||||
ENABLE_VLC="TRUE"
|
||||
AC_MSG_RESULT([yes])
|
||||
PKG_CHECK_MODULES( VLC, libvlc >= 2.0.0 )
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(VLC_CFLAGS)
|
||||
AC_SUBST(VLC_LIBS)
|
||||
AC_SUBST(ENABLE_VLC)
|
||||
|
||||
dnl ===================================================================
|
||||
|
Reference in New Issue
Block a user