diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-18 13:56:55 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-18 14:03:10 +0200 |
| commit | 9c1543bd79dc1da9a7dd7b92146a467589f1ed7e (patch) | |
| tree | e166e2e5914fc34d85e9ec0a1e129cdc5a081e01 | |
| parent | e4810c3420201972ceb8a419e9bbc0b4a7b56f67 (diff) | |
| download | gstreamer-plugins-bad-9c1543bd79dc1da9a7dd7b92146a467589f1ed7e.tar.gz | |
opensles: Integrate into build system
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | sys/Makefile.am | 10 | ||||
| -rw-r--r-- | sys/opensles/Makefile.am | 3 |
3 files changed, 17 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index df95e91f9..74452d003 100644 --- a/configure.ac +++ b/configure.ac @@ -703,6 +703,14 @@ AG_GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [ AC_CHECK_HEADER(linux/cdrom.h, HAVE_VCD="yes", HAVE_VCD="no") ]) +dnl check for OpenSL ES +translit(dnm, m, l) AM_CONDITIONAL(USE_OPENSLES, true) +AG_GST_CHECK_FEATURE(OPENSLES, [OpenSL ES], opensl, [ + AC_CHECK_HEADER(SLES/OpenSLES.h, + AC_CHECK_HEADER(SLES/OpenSLES_Android.h, HAVE_OPENSLES="yes", HAVE_OPENSLES="no"), + HAVE_OPENSLES="no" + ) +]) dnl *** UVC H264 *** translit(dnm, m, l) AM_CONDITIONAL(USE_UVCH264, true) @@ -2068,6 +2076,7 @@ sys/dshowvideosink/Makefile sys/dvb/Makefile sys/fbdev/Makefile sys/linsys/Makefile +sys/opensles/Makefile sys/osxvideo/Makefile sys/qtwrapper/Makefile sys/shm/Makefile diff --git a/sys/Makefile.am b/sys/Makefile.am index d12fff2cb..c638c9de6 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -100,6 +100,12 @@ else SHM_DIR= endif +if USE_OPENSLES +OPENSLES_DIR=opensles +else +OPENSLES_DIR= +endif + # if USE_QCAM # QCAM_DIR=qcam # else @@ -142,9 +148,9 @@ else UVCH264_DIR= endif -SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DIRECTSHOW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) +SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_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) DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ - osxvideo pvr2d qtwrapper shm uvch264 vcd vdpau wasapi wininet winks winscreencap + opensles osxvideo pvr2d qtwrapper shm uvch264 vcd vdpau wasapi wininet winks winscreencap include $(top_srcdir)/common/parallel-subdirs.mak diff --git a/sys/opensles/Makefile.am b/sys/opensles/Makefile.am index 16b171a29..dda503277 100644 --- a/sys/opensles/Makefile.am +++ b/sys/opensles/Makefile.am @@ -15,10 +15,7 @@ libgstopensles_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstopensles_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lOpenSLES - -if !GST_PLUGIN_BUILD_STATIC libgstopensles_la_LIBTOOLFLAGS = --tag=disable-static --tag=CC -endif noinst_HEADERS = openslesringbuffer.h \ openslessink.h \ |