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

remove osx support for 1.0.30

Browse source
This commit is contained in:
winlin 2015-03-17 21:00:28 +08:00
parent 13299ac03a
commit c991c2c92c
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -388,6 +388,7 @@ Supported operating systems and hardware:
## History ## History
* v1.0, 2015-03-17, remove the osx for 1.0.30.
* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
* <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong> * <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong>
* v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27.

5
trunk/auto/depends.sh
View file

@ -299,6 +299,11 @@ function OSX_prepare()
} }
OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi
# by winlin, disable other system.
if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $SRS_EMBEDED_CPU = NO ]]; then
echo "only support Centos and Ubuntu, actual is `uname -s`"
exit 1
fi
##################################################################################### #####################################################################################
# st-1.9 # st-1.9

2
trunk/auto/options.sh
View file

@ -161,7 +161,6 @@ Options:
Presets: Presets:
--x86-x64 [default] for x86/x64 cpu, common pc and servers. --x86-x64 [default] for x86/x64 cpu, common pc and servers.
--osx for IOS(darwin) to build SRS.
--pi for raspberry-pi(directly build), open features hls/ssl/static. --pi for raspberry-pi(directly build), open features hls/ssl/static.
--cubie for cubieboard(directly build), open features except ffmpeg/nginx. --cubie for cubieboard(directly build), open features except ffmpeg/nginx.
--arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild --arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild
@ -252,7 +251,6 @@ function parse_user_option() {
--log-trace) SRS_LOG_TRACE=YES ;; --log-trace) SRS_LOG_TRACE=YES ;;
--x86-x64) SRS_X86_X64=YES ;; --x86-x64) SRS_X86_X64=YES ;;
--osx) SRS_OSX=YES ;;
--arm) SRS_ARM_UBUNTU12=YES ;; --arm) SRS_ARM_UBUNTU12=YES ;;
--mips) SRS_MIPS_UBUNTU12=YES ;; --mips) SRS_MIPS_UBUNTU12=YES ;;
--pi) SRS_PI=YES ;; --pi) SRS_PI=YES ;;

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 29 #define VERSION_REVISION 30
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"