胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
a29bd05c 1 parent 71adff77

refine build script

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 5 行删除
@@ -273,13 +273,13 @@ if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-bui @@ -273,13 +273,13 @@ if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-bui
273 # arm or i386/x86_64 273 # arm or i386/x86_64
274 if [ $SRS_ARM_UBUNTU12 = YES ]; then 274 if [ $SRS_ARM_UBUNTU12 = YES ]; then
275 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} 275 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
  276 +GCC = ${SrsArmGCC}
276 CXX = ${SrsArmCXX} 277 CXX = ${SrsArmCXX}
277 AR = ${SrsArmAR} 278 AR = ${SrsArmAR}
278 LINK = ${SrsArmCXX} 279 LINK = ${SrsArmCXX}
279 END 280 END
280 else 281 else
281 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} 282 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
282 -CC = gcc  
283 GCC = gcc 283 GCC = gcc
284 CXX = g++ 284 CXX = g++
285 AR = ar 285 AR = ar
  1 +GCC = gcc
  2 +
1 .PHONY: default clean help ssl nossl 3 .PHONY: default clean help ssl nossl
2 4
3 default: help 5 default: help
@@ -31,16 +33,16 @@ SRS_LIBRTMP_L = $(SRS_OBJS)/lib/srs_librtmp.a @@ -31,16 +33,16 @@ SRS_LIBRTMP_L = $(SRS_OBJS)/lib/srs_librtmp.a
31 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
32 34
33 srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) 35 srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
34 - gcc srs_publish.c $(SRS_LIBRTMP_L) -g -O0 -lstdc++ -o srs_publish_nossl 36 + $(GCC) srs_publish.c $(SRS_LIBRTMP_L) -g -O0 -lstdc++ -o srs_publish_nossl
35 37
36 srs_play_nossl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) 38 srs_play_nossl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
37 - gcc srs_play.c $(SRS_LIBRTMP_L) -g -O0 -lstdc++ -o srs_play_nossl 39 + $(GCC) srs_play.c $(SRS_LIBRTMP_L) -g -O0 -lstdc++ -o srs_play_nossl
38 40
39 srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) 41 srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
40 - gcc srs_publish.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -ldl -lstdc++ -o srs_publish_ssl 42 + $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -ldl -lstdc++ -o srs_publish_ssl
41 43
42 srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) 44 srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
43 - gcc srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -ldl -lstdc++ -o srs_play_ssl 45 + $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) -g -O0 -ldl -lstdc++ -o srs_play_ssl
44 46
45 # alias for publish/play with/without ssl 47 # alias for publish/play with/without ssl
46 ssl: srs_publish_ssl srs_play_ssl 48 ssl: srs_publish_ssl srs_play_ssl