Skip to content

Commit

Permalink
for ossrs#155, debug srs on xcode.
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Mar 10, 2015
1 parent db7ddfd commit 0ff49fd
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 12 deletions.
10 changes: 10 additions & 0 deletions trunk/auto/depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ if [ $OS_IS_OSX = YES ]; then
echo "OSX detected, must specifies the --osx"
exit 1
fi
# TODO: FIXME: support following features.
if [ $SRS_HTTP_API = YES ]; then
echo "OSX does not support http-api, use --without-http-api"
exit 1
Expand All @@ -357,6 +358,14 @@ if [ $OS_IS_OSX = YES ]; then
echo "OSX does not support stat, use --without-stat"
exit 1
fi
if [ $SRS_FFMPEG_TOOL = YES ]; then
echo "OSX does not support ffmpeg, use --without-ffmpeg"
exit 1
fi
if [ $SRS_NGINX = YES ]; then
echo "OSX does not support nginx, use --without-nginx"
exit 1
fi
fi

#####################################################################################
Expand Down Expand Up @@ -723,3 +732,4 @@ fi
# generated the test script
#####################################################################################
rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/srs.test objs/srs.test

23 changes: 23 additions & 0 deletions trunk/conf/mac.dev.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# no-daemon and write log to console config for srs.
# @see full.conf for detail config.

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_api {
enabled on;
listen 1985;
}
http_server {
enabled on;
listen 8080;
}
vhost __defaultVhost__ {
hls {
enabled on;
hls_fragment 10;
hls_window 60;
hls_path ./objs/nginx/html;
}
}
19 changes: 8 additions & 11 deletions trunk/configure
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@ SRS_OBJS_DIR="objs"
SRS_OBJS="${SRS_WORKDIR}/${SRS_OBJS_DIR}"
mkdir -p ${SRS_OBJS}

#####################################################################################
# linux shell color support.
RED="\\033[31m"
GREEN="\\033[32m"
YELLOW="\\033[33m"
BLACK="\\033[0m"

# clean the exists, when not export srs-librtmp.
# do this only when the options is ok.
if [[ -f Makefile ]]; then
make clean
fi
# remove makefile
rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE}

#####################################################################################
# parse user options, set the variables like:
# srs features: SRS_SSL/SRS_HLS/SRS_NGINX/SRS_FFMPEG_TOOL/SRS_HTTP_CALLBACK/......
Expand Down Expand Up @@ -67,16 +74,6 @@ for SRS_MODULE in $SRS_MODULES; do
__mcleanups="$__mcleanups $SRS_MODULE_NAME"
done

# clean the exists, when not export srs-librtmp.
# do this only when the options is ok.
if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
if [[ -f Makefile ]]; then
make clean
fi
fi
# remove makefile
rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE}

#####################################################################################
# build tools or compiler args.
# enable gdb debug
Expand Down
2 changes: 1 addition & 1 deletion trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@
3C1231E71AAE64A400CE8F6C /* srs_xcode */ = {
isa = PBXGroup;
children = (
3C1232EF1AAEAC5800CE8F6C /* etc */,
3C1232B81AAE824500CE8F6C /* configure */,
3C1232EF1AAEAC5800CE8F6C /* etc */,
3C1232BA1AAE826F00CE8F6C /* auto */,
3C1232B91AAE825100CE8F6C /* scripts */,
3C12324B1AAE81CE00CE8F6C /* app */,
Expand Down
Binary file not shown.

0 comments on commit 0ff49fd

Please sign in to comment.