diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-02-29 10:37:42 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-02-29 10:37:42 +0100 |
| commit | 43e77416362f57e4dbc3ac7cb8049ab3a427130f (patch) | |
| tree | 6e294cfd9a9ee7af9328f212cfd2b8a5318bb46f | |
| parent | 19ea5dd3dfcf6c97e6480c3a4ac84a79d64b000b (diff) | |
| download | icestorm-43e77416362f57e4dbc3ac7cb8049ab3a427130f.tar.gz icestorm-43e77416362f57e4dbc3ac7cb8049ab3a427130f.tar.bz2 icestorm-43e77416362f57e4dbc3ac7cb8049ab3a427130f.zip | |
Use pkg-config for libftdi
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | iceprog/Makefile | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -1,9 +1,11 @@ CXX = clang CC = $(CXX) +PKG_CONFIG = pkg-config DESTDIR ?= PREFIX ?= /usr/local ifeq ($(MXE),1) EXE = .exe CXX = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc +PKG_CONFIG = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-pkg-config endif diff --git a/iceprog/Makefile b/iceprog/Makefile index b9f00d9..a124663 100644 --- a/iceprog/Makefile +++ b/iceprog/Makefile @@ -1,10 +1,9 @@ include ../config.mk -LDLIBS = -L/usr/local/lib -lftdi -lm +LDLIBS = -L/usr/local/lib -lm CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include -ifeq ($(MXE),1) -LDLIBS += -lusb -endif +LDLIBS += $(shell for pkg in libftdi libftdi1; do $(PKG_CONFIG) --silence-errors --libs $$pkg && exit; done; echo -lftdi; ) +CFLAGS += $(shell for pkg in libftdi libftdi1; do $(PKG_CONFIG) --silence-errors --cflags $$pkg && exit; done; ) all: iceprog$(EXE) |