diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-30 15:15:58 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-09 20:46:16 +0100 |
| commit | 21d7f4b4bba79558de830d9e815e127f67274355 (patch) | |
| tree | f0c4e2ab7f96fdcf1ce9393477b773eb64cdd01b /avmedia/Library_avmediagst.mk | |
| parent | 95938a123cbc8c0741a505b61ca874c0153c3f7a (diff) | |
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
Diffstat (limited to 'avmedia/Library_avmediagst.mk')
| -rw-r--r-- | avmedia/Library_avmediagst.mk | 8 |
1 files changed, 2 insertions, 6 deletions
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 \ |