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-17 11:10:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
71adff776bb1f738a0e4344f03299dad23b21813
71adff77
1 parent
77e652fc
fix build script, remove unused build tool defines
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
2 行增加
和
5 行删除
trunk/auto/depends.sh
trunk/configure
trunk/auto/depends.sh
查看文件 @
71adff7
...
...
@@ -402,7 +402,7 @@ 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
&&
./Configure --prefix
=
`
pwd
`
/_release -no-shared no-asm linux-armv4
&&
make
CC
=
${
SrsArmCC
}
GCC
=
${
SrsArmGCC
}
AR
=
"
${
SrsArmAR
}
r"
KD
=
${
SrsArmLD
}
LINK
=
${
SrsArmLINK
}
RANDLIB
=
${
SrsArmRANDLIB
}
&&
make install
&&
make
CC
=
${
SrsArmCC
}
GCC
=
${
SrsArmGCC
}
AR
=
"
${
SrsArmAR
}
r"
LD
=
${
SrsArmLD
}
LINK
=
${
SrsArmGCC
}
RANDLIB
=
${
SrsArmRANDLIB
}
&&
make install
&&
cd
..
&&
ln -sf openssl-1.0.1f/_release openssl
&&
cd
..
&&
touch
${
SRS_OBJS
}
/_flag.ssl.arm.tmp
)
...
...
trunk/configure
查看文件 @
71adff7
...
...
@@ -41,7 +41,6 @@ echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
SrsArmCC
=
"arm-linux-gnueabi-gcc"
SrsArmGCC
=
"arm-linux-gnueabi-gcc"
SrsArmCXX
=
"arm-linux-gnueabi-g++"
SrsArmLINK
=
"arm-linux-gnueabi-g++"
SrsArmAR
=
"arm-linux-gnueabi-ar"
SrsArmLD
=
"arm-linux-gnueabi-ld"
SrsArmRANDLIB
=
"arm-linux-gnueabi-ranlib"
...
...
@@ -274,11 +273,9 @@ if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-bui
# arm or i386/x86_64
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
cat
<< END > ${SRS_OBJS}/${SRS_MAKEFILE}
CC = ${SrsArmCC}
GCC = ${SrsArmGCC}
CXX = ${SrsArmCXX}
AR = ${SrsArmAR}
LINK = ${SrsArm
LINK
}
LINK = ${SrsArm
CXX
}
END
else
cat
<< END > ${SRS_OBJS}/${SRS_MAKEFILE}
...
...
请
注册
或
登录
后发表评论