Include libftdi from SDK if libftdi-config is not installed

404e6ad2 · Vasco Guita · Federico Vaga · c84f4850 · 404e6ad2 · 404e6ad2
Commit 404e6ad2 authored May 03, 2024 by Vasco Guita Committed by Federico Vaga May 03, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 4 deletions

Makefile software/lib/Makefile +9 -4

eeprom.c software/lib/eeprom.c +4 -0

liboattnusb.c software/lib/liboattnusb.c +4 -0

No files found.
--- a/software/lib/Makefile
+++ b/software/lib/Makefile
@@ -47,11 +47,16 @@ LIBFTDI_CONFIG = $(shell command -v libftdi1-config)
 ifeq ($(LIBFTDI_CONFIG),)
    LIBFTDI_CONFIG = $(shell command -v libftdi-config)
 endif
-LIBFTDI_INC := $(shell $(LIBFTDI_CONFIG) --cflags)
+ifeq ($(LIBFTDI_CONFIG),)
-LIBFTDI_LIBS := $(shell $(LIBFTDI_CONFIG) --libs)
+    CFLAGS += -DLIBFTDI1
+    LDLIBS += -lftdi1
+else
+    LIBFTDI_INC := $(shell $(LIBFTDI_CONFIG) --cflags)
+    LIBFTDI_LIBS := $(shell $(LIBFTDI_CONFIG) --libs)
+    CFLAGS += $(LIBFTDI_INC)
+    LDLIBS += $(LIBFTDI_LIBS)
+endif
-CFLAGS += $(LIBFTDI_INC)
-LDLIBS += $(LIBFTDI_LIBS)
 LDLIBS += -ludev
 CPPCHECK ?= cppcheck

--- a/software/lib/eeprom.c
+++ b/software/lib/eeprom.c
@@ -20,7 +20,11 @@
 #include <sys/time.h>
 #include <libusb-1.0/libusb.h>
+#ifdef LIBFTDI1
+#include <libftdi1/ftdi.h>
+#else
 #include <ftdi.h>
+#endif
 #include "liboattnusb.h"
 #include "liboattnusb-i.h"

--- a/software/lib/liboattnusb.c
+++ b/software/lib/liboattnusb.c
@@ -15,7 +15,11 @@
 #include <stdio.h>
 #include <errno.h>
 #include <libusb-1.0/libusb.h>
+#ifdef LIBFTDI1
+#include <libftdi1/ftdi.h>
+#else
 #include <ftdi.h>
+#endif
 #include "liboattnusb.h"
 #include "liboattnusb-i.h"