winlin

fix bug of openssl, use objs/openssl/include

@@ -102,10 +102,19 @@ END @@ -102,10 +102,19 @@ END
102 LibSTRoot="${SRS_OBJS}/st" 102 LibSTRoot="${SRS_OBJS}/st"
103 LibSTfile="${LibSTRoot}/libst.a" 103 LibSTfile="${LibSTRoot}/libst.a"
104 # hp(http-parser) the http request/url parser, for SRS to support HTTP callback. 104 # hp(http-parser) the http request/url parser, for SRS to support HTTP callback.
  105 +LibHttpParserRoot=""
  106 +LibHttpParserfile=""
105 if [ $SRS_HTTP = YES ]; then 107 if [ $SRS_HTTP = YES ]; then
106 LibHttpParserRoot="${SRS_OBJS}/hp" 108 LibHttpParserRoot="${SRS_OBJS}/hp"
107 LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a" 109 LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"
108 fi 110 fi
  111 +# openssl-1.0.1f, for the RTMP complex handshake.
  112 +LibSSLRoot=""
  113 +LibSSLfile=""
  114 +if [ $SRS_SSL = YES ]; then
  115 + LibSSLRoot="${SRS_OBJS}/openssl/include"
  116 + LibSSLfile="${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"
  117 +fi
109 118
110 ##################################################################################### 119 #####################################################################################
111 # Modules, compile each module, then link to binary 120 # Modules, compile each module, then link to binary
@@ -113,10 +122,7 @@ fi @@ -113,10 +122,7 @@ fi
113 #Core Module 122 #Core Module
114 MODULE_ID="CORE" 123 MODULE_ID="CORE"
115 MODULE_DEPENDS=() 124 MODULE_DEPENDS=()
116 -ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})  
117 -if [ $SRS_HTTP = YES ]; then  
118 - ModuleLibIncs="${ModuleLibIncs[@]} ${LibHttpParserRoot}"  
119 -fi 125 +ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
120 MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" 126 MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
121 "srs_core_error" "srs_core_conn" "srs_core_client" 127 "srs_core_error" "srs_core_conn" "srs_core_client"
122 "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" 128 "srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
@@ -144,17 +150,10 @@ MAIN_OBJS="${MODULE_OBJS[@].o}" @@ -144,17 +150,10 @@ MAIN_OBJS="${MODULE_OBJS[@].o}"
144 # all main entrances 150 # all main entrances
145 MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") 151 MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
146 # all depends libraries 152 # all depends libraries
147 -ModuleLibFiles=(${LibSTfile})  
148 -if [ $SRS_HTTP = YES ]; then  
149 - ModuleLibFiles="${ModuleLibFiles[@]} ${LibHttpParserfile}"  
150 -fi 153 +ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
151 # all depends objects 154 # all depends objects
152 MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}" 155 MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}"
153 -if [ $SRS_SSL = YES ]; then  
154 - LINK_OPTIONS="-ldl ${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"  
155 -else  
156 - LINK_OPTIONS="-ldl"  
157 -fi 156 +LINK_OPTIONS="-ldl"
158 # srs(simple rtmp server) over st(state-threads) 157 # srs(simple rtmp server) over st(state-threads)
159 BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh 158 BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh
160 # bandwidth test tool, to test the bandwidth to server 159 # bandwidth test tool, to test the bandwidth to server