diff options
Diffstat (limited to 'src/jtag')
-rw-r--r-- | src/jtag/aice/Makefile.am | 2 | ||||
-rw-r--r-- | src/jtag/drivers/Makefile.am | 2 | ||||
-rw-r--r-- | src/jtag/drivers/libusb1_common.h | 2 | ||||
-rw-r--r-- | src/jtag/drivers/mpsse.c | 2 | ||||
-rw-r--r-- | src/jtag/drivers/ti_icdi_usb.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/jtag/aice/Makefile.am b/src/jtag/aice/Makefile.am index 38c441e1..7b9469d8 100644 --- a/src/jtag/aice/Makefile.am +++ b/src/jtag/aice/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/common.mk -AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers +AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS) noinst_LTLIBRARIES = libocdaice.la diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index e3ed2199..e8f1efbc 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -6,6 +6,8 @@ libocdjtagdrivers_la_LIBADD = libocdjtagdrivers_la_SOURCES = \ $(DRIVERFILES) +libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS) + ULINK_FIRMWARE = $(srcdir)/OpenULINK EXTRA_DIST = $(ULINK_FIRMWARE) diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h index cd1f7f10..0e653d84 100644 --- a/src/jtag/drivers/libusb1_common.h +++ b/src/jtag/drivers/libusb1_common.h @@ -22,7 +22,7 @@ #ifndef JTAG_LIBUSB_COMMON_H #define JTAG_LIBUSB_COMMON_H -#include <libusb-1.0/libusb.h> +#include <libusb.h> #define jtag_libusb_device libusb_device #define jtag_libusb_device_handle libusb_device_handle diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c index c5fd6d7f..c5e0b61c 100644 --- a/src/jtag/drivers/mpsse.c +++ b/src/jtag/drivers/mpsse.c @@ -24,7 +24,7 @@ #include "mpsse.h" #include "helper/log.h" -#include <libusb-1.0/libusb.h> +#include <libusb.h> /* Compatibility define for older libusb-1.0 */ #ifndef LIBUSB_CALL diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c index c0c07187..f10d1207 100644 --- a/src/jtag/drivers/ti_icdi_usb.c +++ b/src/jtag/drivers/ti_icdi_usb.c @@ -33,7 +33,7 @@ #include <target/cortex_m.h> -#include <libusb-1.0/libusb.h> +#include <libusb.h> #define ICDI_WRITE_ENDPOINT 0x02 #define ICDI_READ_ENDPOINT 0x83 |