diff options
| author | Arne Morten Kvarving <spiff@xbmc.org> | 2012-11-07 00:56:24 -0800 |
|---|---|---|
| committer | Arne Morten Kvarving <spiff@xbmc.org> | 2012-11-07 00:56:24 -0800 |
| commit | 92b2a1b5fdc6fd08da84b33e5ab2a29efc67b96a (patch) | |
| tree | 427c804e373587067f451ad811945b714a2f9071 | |
| parent | f849887a04de6f450fc23a02f187aaed6cbc7138 (diff) | |
| parent | ba1564fdc493911bf4f3d94a8576f3f7f498f604 (diff) | |
Merge pull request #1688 from Memphiz/libusb
[droid] - activate usb peripherals available
| -rw-r--r-- | tools/android/depends/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/android/depends/libusb/Makefile | 40 | ||||
| -rw-r--r-- | xbmc/peripherals/bus/PeripheralBusUSB.h | 3 |
3 files changed, 44 insertions, 1 deletions
diff --git a/tools/android/depends/Makefile.in b/tools/android/depends/Makefile.in index 26b5f818f9..8e93c6b9ac 100644 --- a/tools/android/depends/Makefile.in +++ b/tools/android/depends/Makefile.in @@ -13,7 +13,7 @@ SUBDIRS = \ python26-native python26 samba alsa-lib libcdio afpfs-ng libshairport \ libplist libcec libbluray boost tinyxml dummy-libxbmc libsdl \ liblzo2-native libjpeg-turbo-native libpng-native tiff-native libsdl_image rpl \ - libamplayer libssh taglib swig-native pcre-native xbmc-pvr-addons + libamplayer libssh taglib swig-native pcre-native xbmc-pvr-addons libusb .PHONY: buildtools $(BUILDTOOLS) subdirs $(SUBDIRS) arm diff --git a/tools/android/depends/libusb/Makefile b/tools/android/depends/libusb/Makefile new file mode 100644 index 0000000000..8626c80ae4 --- /dev/null +++ b/tools/android/depends/libusb/Makefile @@ -0,0 +1,40 @@ +include ../Makefile.include +DEPS= ../Makefile.include Makefile + +# lib name, version +LIBNAME=libusb +VERSION=0.1.12 +SOURCE=$(LIBNAME)-$(VERSION) +ARCHIVE=$(SOURCE).tar.gz + +# configuration settings +CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ + ./configure --prefix=$(PREFIX) --host=$(HOST) --disable-shared + +LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a + +CLEAN_FILES=$(ARCHIVE) $(PLATFORM) + +all: $(LIBDYLIB) .installed-$(PLATFORM) + +$(TARBALLS_LOCATION)/$(ARCHIVE): + $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) + +$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) + rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); $(CONFIGURE) + +$(LIBDYLIB): $(PLATFORM) + $(MAKE) -C $(PLATFORM) + +.installed-$(PLATFORM): $(LIBDYLIB) + $(MAKE) -C $(PLATFORM) install + touch $@ + +clean: + $(MAKE) -C $(PLATFORM) clean + rm -f .installed-$(PLATFORM) + +distclean:: + rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/xbmc/peripherals/bus/PeripheralBusUSB.h b/xbmc/peripherals/bus/PeripheralBusUSB.h index 7709679087..402863823f 100644 --- a/xbmc/peripherals/bus/PeripheralBusUSB.h +++ b/xbmc/peripherals/bus/PeripheralBusUSB.h @@ -34,4 +34,7 @@ #elif defined(TARGET_DARWIN) #define HAVE_PERIPHERAL_BUS_USB 1 #include "osx/PeripheralBusUSB.h" +#elif defined(TARGET_ANDROID) +#define HAVE_PERIPHERAL_BUS_USB 1 +#include "linux/PeripheralBusUSBLibUSB.h" #endif |