Lines 1-5
Link Here
|
1 |
--- librtmp/Makefile.orig 2011-07-12 09:24:33.000000000 +0900 |
1 |
--- librtmp/Makefile-tmpf 2013-07-04 20:38:27.000000000 +0200 |
2 |
+++ librtmp/Makefile 2012-01-20 10:06:27.000000000 +0900 |
2 |
+++ librtmp/Makefile 2013-07-04 20:38:40.000000000 +0200 |
3 |
@@ -1,19 +1,21 @@ |
3 |
@@ -1,19 +1,21 @@ |
4 |
VERSION=v2.4 |
4 |
VERSION=v2.4 |
5 |
|
5 |
|
Lines 26-32
Link Here
|
26 |
|
26 |
|
27 |
SYS=posix |
27 |
SYS=posix |
28 |
CRYPTO=OPENSSL |
28 |
CRYPTO=OPENSSL |
29 |
@@ -23,7 +25,7 @@ |
29 |
@@ -23,13 +25,13 @@ |
30 |
DEF_GNUTLS=-DUSE_GNUTLS |
30 |
DEF_GNUTLS=-DUSE_GNUTLS |
31 |
DEF_=-DNO_CRYPTO |
31 |
DEF_=-DNO_CRYPTO |
32 |
REQ_GNUTLS=gnutls |
32 |
REQ_GNUTLS=gnutls |
Lines 35-40
Link Here
|
35 |
LIBZ=-lz |
35 |
LIBZ=-lz |
36 |
LIBS_posix= |
36 |
LIBS_posix= |
37 |
LIBS_darwin= |
37 |
LIBS_darwin= |
|
|
38 |
LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
39 |
LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) |
40 |
-LIB_OPENSSL=-lssl -lcrypto $(LIBZ) |
41 |
+LIB_OPENSSL=-L/usr/local/lib -lssl -lcrypto $(LIBZ) |
42 |
LIB_POLARSSL=-lpolarssl $(LIBZ) |
43 |
PRIVATE_LIBS=$(LIBS_$(SYS)) |
44 |
CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) |
38 |
@@ -67,7 +69,8 @@ |
45 |
@@ -67,7 +69,8 @@ |
39 |
|
46 |
|
40 |
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
47 |
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |