Merge remote-tracking branch 'upstream/master' into dev
This commit is contained in:
commit
ac2b977168
51 changed files with 877 additions and 162 deletions
1
Makefile
1
Makefile
|
|
@ -28,6 +28,7 @@ UNAME := $(shell uname)
|
|||
|
||||
ifeq ($(UNAME), Linux)
|
||||
LIBS+=-lrt
|
||||
CFLAGS+=-std=c11 -D_DEFAULT_SOURCE
|
||||
endif
|
||||
ifeq ($(UNAME), Darwin)
|
||||
# TODO: Putting GCC in C11 mode breaks things.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue