From 21d7f4b4bba79558de830d9e815e127f67274355 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 30 Jul 2012 15:15:58 +0200 Subject: gstreamer: make gstreamer 1.0 and 0.10 dual compile Add fallback activation of an _OLD media component to the core. Compile both a 0.10 and 1.0 version of the gstreamer component Change-Id: I91f65d05391cb2d7e02f9cff18f96178a128705O1 --- avmedia/Library_avmediagst.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'avmedia/Library_avmediagst.mk') diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 6336ee44b2db..ee8a09aadb98 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -33,8 +33,9 @@ $(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/a $(eval $(call gb_Library_set_include,avmediagst,\ $$(INCLUDE) \ -I$(SRCDIR)/avmedia/source/inc \ - $(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \ + $(GSTREAMER_CFLAGS) \ )) +$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS))) $(eval $(call gb_Library_use_sdk_api,avmediagst)) @@ -54,11 +55,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_libs,avmediagst,\ - $(shell pkg-config --libs gstreamer-0.10, gstreamer-plugins-base-0.10) \ - -lgstinterfaces-0.10 \ -)) - $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstmanager \ avmedia/source/gstreamer/gstplayer \ -- cgit v1.2.3