File tree 2 files changed +4
-3
lines changed
2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 10
10
# $APP_NAME the app name to output. ie. srs
11
11
# $MODULE_OBJS array, the objects to compile the app.
12
12
# $ModuleLibFiles array, the 3rdpart library file to link with. ie. [objs/st-1.9/obj/libst.a objs/libx264/obj/libx264.a]
13
+ # $LINK_OPTIONS the linker options. ie. -ldl
13
14
14
15
FILE=${SRS_OBJS} /Makefile
15
16
@@ -88,7 +89,7 @@ for item in ${ModuleLibFiles[*]}; do
88
89
echo -n " $item " >> ${FILE}
89
90
done
90
91
# link options.
91
- echo -n " ${LDFLAGS } " >> ${FILE}
92
+ echo -n " ${LINK_OPTIONS } " >> ${FILE}
92
93
echo " " >> ${FILE}
93
94
echo " " >> ${FILE}
94
95
Original file line number Diff line number Diff line change @@ -420,7 +420,7 @@ if [[ $SRS_SRT == YES ]]; then
420
420
ModuleLibIncs+=(${LibSRTRoot} )
421
421
MODULE_OBJS=" ${MODULE_OBJS} ${SRT_OBJS[@]} "
422
422
fi
423
- LDFLAGS =" ${LDFLAGS} ${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink} "
423
+ LINK_OPTIONS =" ${LDFLAGS} ${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink} "
424
424
#
425
425
# srs: srs(simple rtmp server) over st(state-threads)
426
426
BUILD_KEY=" srs" APP_MAIN=" srs_main_server" APP_NAME=" srs" . $SRS_WORKDIR /auto/apps.sh
@@ -484,7 +484,7 @@ if [[ $SRS_UTEST == YES ]]; then
484
484
fi
485
485
MODULE_DEPENDS=(" CORE" " KERNEL" " PROTOCOL" " APP" )
486
486
MODULE_OBJS=" ${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${SRT_OBJS[@]} "
487
- LDFLAGS =" ${LDFLAGS} -lpthread ${SrsLinkOptions} " MODULE_DIR=" src/utest" APP_NAME=" srs_utest" . $SRS_WORKDIR /auto/utest.sh
487
+ LINK_OPTIONS =" ${LDFLAGS} -lpthread ${SrsLinkOptions} " MODULE_DIR=" src/utest" APP_NAME=" srs_utest" . $SRS_WORKDIR /auto/utest.sh
488
488
fi
489
489
490
490
# ####################################################################################
You can’t perform that action at this time.
0 commit comments