胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
618f6f52 1 parent 1a3142d2

fix bug of librtmp sample on x86/x64 platform

内嵌 并排对比
正在显示 1 个修改的文件 包含 16 行增加 和 0 行删除
@@ -32,6 +32,21 @@ SRS_LIBRTMP_L = $(SRS_OBJS)/lib/srs_librtmp.a @@ -32,6 +32,21 @@ SRS_LIBRTMP_L = $(SRS_OBJS)/lib/srs_librtmp.a
32 # openssl for complex handshake, built by srs. 32 # openssl for complex handshake, built by srs.
33 SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a 33 SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a
34 34
  35 +# for x86/x64 platform
  36 +ifeq ($(GCC), gcc)
  37 +srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
  38 + $(GCC) srs_publish.c $(SRS_LIBRTMP_L) -g -O0 -lstdc++ -o srs_publish_nossl
  39 +
  40 +srs_play_nossl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
  41 + $(GCC) srs_play.c $(SRS_LIBRTMP_L) -g -O0 -lstdc++ -o srs_play_nossl
  42 +
  43 +srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
  44 + $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -ldl -lstdc++ -o srs_publish_ssl
  45 +
  46 +srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
  47 + $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -ldl -lstdc++ -o srs_play_ssl
  48 +# for arm.
  49 +else
35 srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) 50 srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
36 $(GCC) srs_publish.c $(SRS_LIBRTMP_L) -g -O0 -static -lstdc++ -o srs_publish_nossl 51 $(GCC) srs_publish.c $(SRS_LIBRTMP_L) -g -O0 -static -lstdc++ -o srs_publish_nossl
37 52
@@ -43,6 +58,7 @@ srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_ @@ -43,6 +58,7 @@ srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_
43 58
44 srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) 59 srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
45 $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -static -ldl -lstdc++ -o srs_play_ssl 60 $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -static -ldl -lstdc++ -o srs_play_ssl
  61 +endif
46 62
47 # alias for publish/play with/without ssl 63 # alias for publish/play with/without ssl
48 ssl: srs_publish_ssl srs_play_ssl 64 ssl: srs_publish_ssl srs_play_ssl