external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix bug of mips

Browse source
This commit is contained in:
winlin 2014-05-04 19:13:21 +08:00
parent 0c121f1c9b
commit e5290725ab
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/depends.sh
View file

@ -690,4 +690,4 @@ echo "" >> $SRS_AUTO_HEADERS_H
#####################################################################################
# generated the test script
#####################################################################################
rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/srs.test objs/srs.test
rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/test_configure.sh objs/srs.test

2
trunk/configure vendored
View file

@ -428,7 +428,7 @@ if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="
# TODO: FIXME: remove static.
if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi
# if mips, add -lgcc_eh, or stl compile failed.
if [ $SRS_MIPS_UBUNTU12 = NO ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi
if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi
#####################################################################################
# Modules, compile each module, then link to binary

7
trunk/research/librtmp/Makefile
View file

@ -41,10 +41,15 @@ SRS_RESEARCH_DEPS = Makefile srs_research_public.h
# for x86/x64 platform
ifeq ($(GCC), gcc)
EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++
endif
# for arm.
else
ifeq ($(GCC), arm-linux-gnueabi-gcc)
EXTRA_CXX_FLAG = -g -O0 -ldl -static -lstdc++
endif
# for mips, add -lgcc_eh, or stl compile failed.
ifeq ($(GCC), mipsel-openwrt-linux-gcc)
EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++ -lgcc_eh
endif
srs_publish_nossl: srs_publish.c $(SRS_RESEARCH_DEPS) $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
$(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_publish_nossl