~mdw / termux-packages / blame
| Commit | Line | Data |
|---|---|---|
| a43f8ae3 PR |
1 | diff --git a/Makefile b/Makefile |
| 2 | index 7470eb4..03dd0e9 100644 | |
| 3 | --- a/Makefile | |
| 4 | +++ b/Makefile | |
| 5 | @@ -1,10 +1,5 @@ | |
| 6 | VERSION=v2.3 | |
| 7 | ||
| 8 | -prefix=/usr/local | |
| 9 | - | |
| 10 | -CC=$(CROSS_COMPILE)gcc | |
| 11 | -LD=$(CROSS_COMPILE)ld | |
| 12 | - | |
| 13 | SYS=posix | |
| 14 | #SYS=mingw | |
| 15 | ||
| 16 | @@ -20,8 +15,8 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) | |
| 17 | ||
| 18 | DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) | |
| 19 | OPT=-O2 | |
| 20 | -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) | |
| 21 | -LDFLAGS=-Wall $(XLDFLAGS) | |
| 22 | +CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) | |
| 23 | +LDFLAGS+=-Wall $(XLDFLAGS) | |
| 24 | ||
| 25 | bindir=$(prefix)/bin | |
| 26 | sbindir=$(prefix)/sbin | |
| 27 | @@ -35,7 +30,7 @@ LIBS_posix= | |
| 28 | LIBS_mingw=-lws2_32 -lwinmm -lgdi32 | |
| 29 | LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) | |
| 30 | ||
| 31 | -THREADLIB_posix=-lpthread | |
| 32 | +THREADLIB_posix= | |
| 33 | THREADLIB_mingw= | |
| 34 | THREADLIB=$(THREADLIB_$(SYS)) | |
| 35 | SLIBS=$(THREADLIB) $(LIBS) | |
| 36 | ||
| 37 | diff --git a/librtmp/Makefile b/librtmp/Makefile | |
| 38 | index 6774db7..6e8d6c9 100644 | |
| 39 | --- a/librtmp/Makefile | |
| 40 | +++ b/librtmp/Makefile | |
| 41 | @@ -1,11 +1,5 @@ | |
| 42 | VERSION=v2.3 | |
| 43 | ||
| 44 | -prefix=/usr/local | |
| 45 | - | |
| 46 | -CC=$(CROSS_COMPILE)gcc | |
| 47 | -LD=$(CROSS_COMPILE)ld | |
| 48 | -AR=$(CROSS_COMPILE)ar | |
| 49 | - | |
| 50 | SYS=posix | |
| 51 | CRYPTO=OPENSSL | |
| 52 | #CRYPTO=GNUTLS |