Merge branch 'upstream'

This commit is contained in:
Oliver Jowett 2016-04-11 12:11:05 +01:00
commit 50d67ff722
10 changed files with 192 additions and 167 deletions

View file

@ -31,10 +31,15 @@ LIBS+=-lrt
endif
ifeq ($(UNAME), Darwin)
# TODO: Putting GCC in C11 mode breaks things.
CFLAGS+=-std=c11
CFLAGS+=-std=c11 -DMISSING_GETTIME -DMISSING_NANOSLEEP
COMPAT+=compat/clock_gettime/clock_gettime.o compat/clock_nanosleep/clock_nanosleep.o
endif
ifeq ($(UNAME), OpenBSD)
CFLAGS+= -DMISSING_NANOSLEEP
COMPAT+= compat/clock_nanosleep/clock_nanosleep.o
endif
all: dump1090 view1090
%.o: %.c *.h