aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2013-04-17 15:29:14 +0200
committerMemphiz <memphis@machzwo.de>2013-05-02 19:12:50 +0200
commitad20c6f9073ad2852d1cf981f91ca7b66019c773 (patch)
tree3f01d3e86898e79074f041a4d92da0785dcb5d7c /tools
parentc45b4e0593a407821d737ddf33037d4b398ed7db (diff)
[airtunes] - make libshairplay the new default airtunes library and allow configure to detect and fallback to libshairport if needed
Diffstat (limited to 'tools')
-rw-r--r--tools/android/packaging/Makefile2
-rw-r--r--tools/depends/target/Makefile3
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile
index 2174415d7b..a8cb7e0af8 100644
--- a/tools/android/packaging/Makefile
+++ b/tools/android/packaging/Makefile
@@ -3,7 +3,7 @@ include ../../depends/Makefile.include
OBJS = libcurl.so \
librtmp.so libmad.so \
libafpclient.so \
- libshairport.so libplist.so \
+ libshairplay.so libplist.so \
libxbogg.so libxbvorbis.so libxbvorbisfile.so libxbFLAC.so libxbmpeg2.so \
libxbmpeg2convert.so libnfs.so libass.so
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 17298f1d2b..f1298f496a 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -12,7 +12,7 @@ DEPENDS = \
libogg libvorbis libflac libmad fribidi libmpeg2 \
libass libsamplerate \
libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
- python26 afpfs-ng libshairport \
+ python26 afpfs-ng libshairplay \
libplist libcec libbluray boost tinyxml dummy-libxbmc \
libamplayer libssh taglib xbmc-pvr-addons libusb libnfs libmp3lame \
pythonmodule-pil
@@ -73,7 +73,6 @@ libmicrohttpd: openssl libgpg-error libgcrypt
python26: expat gettext libxml2 sqlite3 openssl libffi
libcdio: $(ICONV)
afpfs-ng: libgcrypt $(ICONV)
-libshairport: openssl
libplist: libxml2 $(ZLIB)
libbluray: $(ICONV) libxml2
libssh: openssl