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
2015-09-23 11:54:53 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f6e655396c98a0f5ad234a690a66704f653f8b95
f6e65539
1 parent
16730ea0
for #485, support cross build for arm
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
35 行增加
和
23 行删除
trunk/auto/auto_headers.sh
trunk/auto/setup_variables.sh
trunk/configure
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
trunk/auto/auto_headers.sh
查看文件 @
f6e6553
...
...
@@ -43,29 +43,6 @@ echo "" >> $SRS_AUTO_HEADERS_H
#####################################################################################
# generate auto headers file, depends on the finished of options.sh
#####################################################################################
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
__SrsArmCC
=
"arm-linux-gnueabi-gcc"
;
__SrsArmGCC
=
"arm-linux-gnueabi-gcc"
;
__SrsArmCXX
=
"arm-linux-gnueabi-g++"
;
__SrsArmAR
=
"arm-linux-gnueabi-ar"
;
__SrsArmLD
=
"arm-linux-gnueabi-ld"
;
__SrsArmRANDLIB
=
"arm-linux-gnueabi-ranlib"
;
fi
if
[
$SRS_MIPS_UBUNTU12
=
YES
]
;
then
__SrsArmCC
=
"mipsel-openwrt-linux-gcc"
;
__SrsArmGCC
=
"mipsel-openwrt-linux-gcc"
;
__SrsArmCXX
=
"mipsel-openwrt-linux-g++"
;
__SrsArmAR
=
"mipsel-openwrt-linux-ar"
;
__SrsArmLD
=
"mipsel-openwrt-linux-ld"
;
__SrsArmRANDLIB
=
"mipsel-openwrt-linux-ranlib"
;
fi
# the arm-ubuntu12 options for make for depends
if
[[
-z
$SrsArmCC
]]
;
then
SrsArmCC
=
$__SrsArmCC
;
fi
if
[[
-z
$SrsArmGCC
]]
;
then
SrsArmGCC
=
$__SrsArmGCC
;
fi
if
[[
-z
$SrsArmCXX
]]
;
then
SrsArmCXX
=
$__SrsArmCXX
;
fi
if
[[
-z
$SrsArmAR
]]
;
then
SrsArmAR
=
$__SrsArmAR
;
fi
if
[[
-z
$SrsArmLD
]]
;
then
SrsArmLD
=
$__SrsArmLD
;
fi
if
[[
-z
$SrsArmRANDLIB
]]
;
then
SrsArmRANDLIB
=
$__SrsArmRANDLIB
;
fi
# write to source file
if
[
$SRS_CROSS_BUILD
=
YES
]
;
then
echo
"cc=
$SrsArmCC
gcc=
$SrsArmGCC
g++=
$SrsArmCXX
ar=
$SrsArmAR
ld=
$SrsArmLD
randlib=
$SrsArmRANDLIB
"
...
...
trunk/auto/setup_variables.sh
0 → 100644
查看文件 @
f6e6553
#!/bin/bash
# when options parsed, setup some variables, then build the depends.
# when arm specified, setup the cross build variables.
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
__SrsArmCC
=
"arm-linux-gnueabi-gcc"
;
__SrsArmGCC
=
"arm-linux-gnueabi-gcc"
;
__SrsArmCXX
=
"arm-linux-gnueabi-g++"
;
__SrsArmAR
=
"arm-linux-gnueabi-ar"
;
__SrsArmLD
=
"arm-linux-gnueabi-ld"
;
__SrsArmRANDLIB
=
"arm-linux-gnueabi-ranlib"
;
fi
if
[
$SRS_MIPS_UBUNTU12
=
YES
]
;
then
__SrsArmCC
=
"mipsel-openwrt-linux-gcc"
;
__SrsArmGCC
=
"mipsel-openwrt-linux-gcc"
;
__SrsArmCXX
=
"mipsel-openwrt-linux-g++"
;
__SrsArmAR
=
"mipsel-openwrt-linux-ar"
;
__SrsArmLD
=
"mipsel-openwrt-linux-ld"
;
__SrsArmRANDLIB
=
"mipsel-openwrt-linux-ranlib"
;
fi
# the arm-ubuntu12 options for make for depends
if
[[
-z
$SrsArmCC
]]
;
then
SrsArmCC
=
$__SrsArmCC
;
fi
if
[[
-z
$SrsArmGCC
]]
;
then
SrsArmGCC
=
$__SrsArmGCC
;
fi
if
[[
-z
$SrsArmCXX
]]
;
then
SrsArmCXX
=
$__SrsArmCXX
;
fi
if
[[
-z
$SrsArmAR
]]
;
then
SrsArmAR
=
$__SrsArmAR
;
fi
if
[[
-z
$SrsArmLD
]]
;
then
SrsArmLD
=
$__SrsArmLD
;
fi
if
[[
-z
$SrsArmRANDLIB
]]
;
then
SrsArmRANDLIB
=
$__SrsArmRANDLIB
;
fi
...
...
trunk/configure
查看文件 @
f6e6553
...
...
@@ -23,6 +23,9 @@ BLACK="\\033[0m"
# parse options, exit with error when parse options invalid.
. auto/options.sh
# setup variables when options parsed.
. auto/setup_variables.sh
# clean the exists, when not export srs-librtmp.
# do this only when the options is ok.
if
[[
-f Makefile
]]
;
then
...
...
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
查看文件 @
f6e6553
...
...
@@ -352,6 +352,7 @@
3C689F9B1AB6AAC800C9CEEE /* sched.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sched.c; path = "../../objs/st-1.9/sched.c"; sourceTree = "<group>"; };
3C689F9C1AB6AAC800C9CEEE /* stk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stk.c; path = "../../objs/st-1.9/stk.c"; sourceTree = "<group>"; };
3C689F9D1AB6AAC800C9CEEE /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = "../../objs/st-1.9/sync.c"; sourceTree = "<group>"; };
3CB25C281BB2596300C97A63 /* setup_variables.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = setup_variables.sh; path = ../../../auto/setup_variables.sh; sourceTree = "<group>"; };
3CC52DCA1ACE4023006FEB01 /* srs_utest_amf0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_amf0.cpp; path = ../../src/utest/srs_utest_amf0.cpp; sourceTree = "<group>"; };
3CC52DCB1ACE4023006FEB01 /* srs_utest_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_amf0.hpp; path = ../../src/utest/srs_utest_amf0.hpp; sourceTree = "<group>"; };
3CC52DCC1ACE4023006FEB01 /* srs_utest_config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_config.cpp; path = ../../src/utest/srs_utest_config.cpp; sourceTree = "<group>"; };
...
...
@@ -632,6 +633,7 @@
3C1232C31AAE827E00CE8F6C /* local_ip.sh */,
3C1232C41AAE827E00CE8F6C /* modules.sh */,
3C1232C51AAE827E00CE8F6C /* options.sh */,
3CB25C281BB2596300C97A63 /* setup_variables.sh */,
3C1232C61AAE827E00CE8F6C /* summary.sh */,
3C1232C71AAE827E00CE8F6C /* utest.sh */,
);
...
...
请
注册
或
登录
后发表评论