正在显示
3 个修改的文件
包含
8 行增加
和
3 行删除
| @@ -690,4 +690,4 @@ echo "" >> $SRS_AUTO_HEADERS_H | @@ -690,4 +690,4 @@ echo "" >> $SRS_AUTO_HEADERS_H | ||
| 690 | ##################################################################################### | 690 | ##################################################################################### |
| 691 | # generated the test script | 691 | # generated the test script |
| 692 | ##################################################################################### | 692 | ##################################################################################### |
| 693 | -rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/srs.test objs/srs.test | 693 | +rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/test_configure.sh objs/srs.test |
| @@ -428,7 +428,7 @@ if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions=" | @@ -428,7 +428,7 @@ if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions=" | ||
| 428 | # TODO: FIXME: remove static. | 428 | # TODO: FIXME: remove static. |
| 429 | if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi | 429 | if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi |
| 430 | # if mips, add -lgcc_eh, or stl compile failed. | 430 | # if mips, add -lgcc_eh, or stl compile failed. |
| 431 | -if [ $SRS_MIPS_UBUNTU12 = NO ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi | 431 | +if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi |
| 432 | 432 | ||
| 433 | ##################################################################################### | 433 | ##################################################################################### |
| 434 | # Modules, compile each module, then link to binary | 434 | # Modules, compile each module, then link to binary |
| @@ -41,10 +41,15 @@ SRS_RESEARCH_DEPS = Makefile srs_research_public.h | @@ -41,10 +41,15 @@ SRS_RESEARCH_DEPS = Makefile srs_research_public.h | ||
| 41 | # for x86/x64 platform | 41 | # for x86/x64 platform |
| 42 | ifeq ($(GCC), gcc) | 42 | ifeq ($(GCC), gcc) |
| 43 | EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++ | 43 | EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++ |
| 44 | +endif | ||
| 44 | # for arm. | 45 | # for arm. |
| 45 | -else | 46 | +ifeq ($(GCC), arm-linux-gnueabi-gcc) |
| 46 | EXTRA_CXX_FLAG = -g -O0 -ldl -static -lstdc++ | 47 | EXTRA_CXX_FLAG = -g -O0 -ldl -static -lstdc++ |
| 47 | endif | 48 | endif |
| 49 | +# for mips, add -lgcc_eh, or stl compile failed. | ||
| 50 | +ifeq ($(GCC), mipsel-openwrt-linux-gcc) | ||
| 51 | + EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++ -lgcc_eh | ||
| 52 | +endif | ||
| 48 | 53 | ||
| 49 | srs_publish_nossl: srs_publish.c $(SRS_RESEARCH_DEPS) $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) | 54 | srs_publish_nossl: srs_publish.c $(SRS_RESEARCH_DEPS) $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) |
| 50 | $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_publish_nossl | 55 | $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_publish_nossl |
-
请 注册 或 登录 后发表评论