Merge branch 'upstream'
This commit is contained in:
commit
50d67ff722
10 changed files with 192 additions and 167 deletions
7
Makefile
7
Makefile
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue