Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-03-01 00:17:41 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ac3be1043582c606b41795d7750b1eb9e83314c9
ac3be104
1 parent
7fa031e7
patch st and srs for arm build, allow user to specifies the gcc/g++
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
33 行增加
和
4 行删除
trunk/3rdparty/1.st.arm.Makefile.patch
trunk/3rdparty/readme.txt
trunk/auto/depends.sh
trunk/configure
trunk/3rdparty/1.st.arm.Makefile.patch
0 → 100644
查看文件 @
ac3be10
Common subdirectories: st-1.9/docs and st-1.9.patch/docs
Common subdirectories: st-1.9/examples and st-1.9.patch/examples
Common subdirectories: st-1.9/extensions and st-1.9.patch/extensions
diff -u st-1.9/Makefile st-1.9.patch/Makefile
--- st-1.9/Makefile 2009-10-02 06:55:03.000000000 +0800
+++ st-1.9.patch/Makefile 2014-02-28 23:38:39.298697732 +0800
@@ -57,10 +57,10 @@
# possible compilation options.
##########################
-CC = cc
-AR = ar
-LD = ld
-RANLIB = ranlib
+CC ?= cc
+AR ?= ar
+LD ?= ld
+RANLIB ?= ranlib
LN = ln
SHELL = /bin/sh
...
...
trunk/3rdparty/readme.txt
查看文件 @
ac3be10
...
...
@@ -25,6 +25,9 @@ x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
tools/ccache-3.1.9.zip
to fast build.
1.st.arm.Makefile.patch
st编译脚本补丁,允许用户指定cc编译器。
links:
ffmpeg:
http://ffmpeg.org/
...
...
trunk/auto/depends.sh
查看文件 @
ac3be10
...
...
@@ -181,7 +181,9 @@ else
echo
"build st-1.9t"
;
(
rm -rf
${
SRS_OBJS
}
/st-1.9
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/st-1.9.zip
&&
cd
st-1.9
&&
make linux-debug
&&
unzip -q ../3rdparty/st-1.9.zip
&&
cd
st-1.9
&&
patch -p1 < ../../3rdparty/1.st.arm.Makefile.patch
&&
make linux-debug
&&
cd
..
&&
rm -f st
&&
ln -sf st-1.9/obj st
)
fi
...
...
@@ -349,7 +351,8 @@ if [ $SRS_SSL = YES ]; then
(
rm -rf
${
SRS_OBJS
}
/openssl-1.0.1f
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/openssl-1.0.1f.zip
&&
cd
openssl-1.0.1f
&&
./config --prefix
=
`
pwd
`
/_release -no-shared
&&
make
&&
make install
&&
./config --prefix
=
`
pwd
`
/_release -no-shared
&&
make
&&
make install
&&
cd
..
&&
ln -sf openssl-1.0.1f/_release openssl
)
fi
...
...
trunk/configure
查看文件 @
ac3be10
...
...
@@ -82,10 +82,12 @@ CppStd="-ansi"
CXXFLAGS
=
"
${
CppStd
}
${
WarnLevel
}
${
GDBDebug
}
"
#CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug} ${Performance}"
cat
<< END > ${SRS_OBJS}/${SRS_MAKEFILE}
CXXFLAGS ?= ${CXXFLAGS}
CC ?= gcc
GCC ?= gcc
CXX ?= g++
LINK ?= \$(CXX)
AR ?= ar
CXXFLAGS = ${CXXFLAGS}
LINK = g++
.PHONY: default srs bandwidth
...
...
请
注册
或
登录
后发表评论