Merge remote-tracking branch 'upstream/master' into ipv6
This commit is contained in:
commit
37870fed22
8
Makefile
8
Makefile
@ -1,6 +1,6 @@
|
||||
CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
|
||||
LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
|
||||
CC=gcc
|
||||
CFLAGS?=-O2 -g -Wall -W $(shell pkg-config --cflags librtlsdr)
|
||||
LDLIBS+=$(shell pkg-config --libs librtlsdr) -lpthread -lm
|
||||
CC?=gcc
|
||||
PROGNAME=dump1090
|
||||
|
||||
all: dump1090
|
||||
@ -9,7 +9,7 @@ all: dump1090
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
dump1090: dump1090.o anet.o
|
||||
$(CC) -g -o dump1090 dump1090.o anet.o $(LIBS)
|
||||
$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS) $(LDLIBS)
|
||||
|
||||
clean:
|
||||
rm -f *.o dump1090
|
||||
|
@ -19,7 +19,7 @@ The main features are:
|
||||
* Interactive command-line-interfae mode where aircrafts currently detected
|
||||
are shown as a list refreshing as more data arrives.
|
||||
* CPR coordinates decoding and track calculation from velocity.
|
||||
* TCP server streaming and recceiving raw data to/from connected clients
|
||||
* TCP server streaming and receiving raw data to/from connected clients
|
||||
(using --net).
|
||||
|
||||
While from time to time I still add / fix stuff in my fork, I target
|
||||
|
@ -2260,6 +2260,7 @@ int handleHTTPRequest(struct client *c) {
|
||||
"Content-Type: %s\r\n"
|
||||
"Connection: %s\r\n"
|
||||
"Content-Length: %d\r\n"
|
||||
"Access-Control-Allow-Origin: *\r\n"
|
||||
"\r\n",
|
||||
ctype,
|
||||
keepalive ? "keep-alive" : "close",
|
||||
|
Loading…
Reference in New Issue
Block a user