diff options
| author | Mitch Bradley <wmb@firmworks.com> | 2016-10-29 09:10:57 -1000 |
|---|---|---|
| committer | Mitch Bradley <wmb@firmworks.com> | 2016-10-29 09:10:57 -1000 |
| commit | 549b9a76a280352b1668302d49237bea4ae2b672 (patch) | |
| tree | 3c641282f8bc59d329ab59a77d15135c9d946d5d | |
| parent | 23357c646d8134e5842a581922cfcd1c28aedccd (diff) | |
| download | cforth-549b9a76a280352b1668302d49237bea4ae2b672.tar.gz | |
host-serial-linux* - default to no FTDI or OPENGL
Those modes requires additional packages to be installed, which can be
troublesome. Without FTDI, it is still possible to access serial ports
in their normal modes, but you cannot use the fancy features of FTDI
chips to do things like using them as GPIO ports.
| -rw-r--r-- | build/host-serial-linux/Makefile | 8 | ||||
| -rw-r--r-- | build/host-serial-linux64/Makefile | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/build/host-serial-linux/Makefile b/build/host-serial-linux/Makefile index fae70e6..463c579 100644 --- a/build/host-serial-linux/Makefile +++ b/build/host-serial-linux/Makefile @@ -8,8 +8,10 @@ ifneq "$(findstring 86,$(shell uname -m))" "" CONFIG += -m32 endif -FTDI = y -INCS += -I/usr/include/libusb-1.0 -LIBS += -lusb-1.0 +FTDI = n +ifeq ($(FTDI),y) +INCS += $(shell pkg-config --cflags libusb-1.0) +LIBS += $(shell pkg-config --libs libusb-1.0) +endif include $(TOPDIR)/src/app/host-serial/targets.mk diff --git a/build/host-serial-linux64/Makefile b/build/host-serial-linux64/Makefile index ebd4480..84426e1 100644 --- a/build/host-serial-linux64/Makefile +++ b/build/host-serial-linux64/Makefile @@ -9,7 +9,14 @@ CONFIG += -DFLOATING -DMOREFP LIBS += -lm -# OpenGL stuff +FTDI = n +ifeq ($(FTDI),y) +INCS += $(shell pkg-config --cflags libusb-1.0) +LIBS += $(shell pkg-config --libs libusb-1.0) +endif + +OPENGL = n +ifeq ($(OPENGL),y) # You may need sudo apt-get install libglfw3-dev CONFIG += -DMAXDICT=0x800000 CONFIG += -DOPENGL @@ -19,10 +26,6 @@ INCS += $(shell pkg-config --cflags glfw3 glu) LIBS += $(shell pkg-config --static --libs glfw3 ) LIBS += $(shell pkg-config --libs glu) -FTDI = y -INCS += $(shell pkg-config --cflags libusb-1.0) -LIBS += $(shell pkg-config --libs libusb-1.0) - MYOBJS += glops.o forth.o: glops.h @@ -34,6 +37,7 @@ glops.h: makegcalls glops.h: $(TOPDIR)/src/cforth/glops.c ./makegcalls <$< +endif EXTRA_CLEAN += makegcalls glops.h gcalls.fth |