From ff964d8e0b20327ab3c11a591169347c1f7b9c00 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 28 Sep 2016 09:39:37 +0200 Subject: [PATCH] libusb: move hci_transport_h2_libusb.c into platform/libusb to fix compile daemon with h2 --- {port => platform}/libusb/hci_transport_h2_libusb.c | 0 port/daemon/src/Makefile.in | 3 ++- port/libusb/Makefile | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) rename {port => platform}/libusb/hci_transport_h2_libusb.c (100%) diff --git a/port/libusb/hci_transport_h2_libusb.c b/platform/libusb/hci_transport_h2_libusb.c similarity index 100% rename from port/libusb/hci_transport_h2_libusb.c rename to platform/libusb/hci_transport_h2_libusb.c diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in index 2025564b9..b03f8f67b 100644 --- a/port/daemon/src/Makefile.in +++ b/port/daemon/src/Makefile.in @@ -15,8 +15,9 @@ LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ VPATH += ${BTSTACK_ROOT}/platform/daemon/src -VPATH += ${BTSTACK_ROOT}/platform/posix VPATH += ${BTSTACK_ROOT}/platform/corefoundation +VPATH += ${BTSTACK_ROOT}/platform/libusb +VPATH += ${BTSTACK_ROOT}/platform/posix VPATH += ${BTSTACK_ROOT}/src VPATH += ${BTSTACK_ROOT}/src/ble VPATH += ${BTSTACK_ROOT}/src/classic diff --git a/port/libusb/Makefile b/port/libusb/Makefile index d817e973b..986fe976e 100644 --- a/port/libusb/Makefile +++ b/port/libusb/Makefile @@ -16,6 +16,7 @@ CFLAGS += -I${BTSTACK_ROOT}/platform/posix \ VPATH += ${BTSTACK_ROOT}/platform/embedded VPATH += ${BTSTACK_ROOT}/platform/posix +VPATH += ${BTSTACK_ROOT}/platform/libusb ifeq ($(OS),Windows_NT) LDFLAGS += -lws2_32