Fix build failed.

8 years ago · 121eadbc07
parent 1bf99e8f3e
commit 121eadbc07
2 changed files with 4 additions and 4 deletions
--- a/circle.yml
+++ b/circle.yml
@ -2,10 +2,10 @@
 general:
    branches:
        only:
+            - 3.0release
            - 2.0release
            - develop
            - master
-            - bms
            - /feature\/.*/
            - /hotfix\/.*/
            - /release\/.*/
--- a/trunk/research/librtmp/Makefile
+++ b/trunk/research/librtmp/Makefile
@ -70,10 +70,10 @@ endif
 # for ssl or nossl
 ifeq ($(HANDSHAKE), SSL)
    SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a
-endif
    ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes)
        SRS_LIBSSL_L = -lssl -lcrypto
    endif
+endif

 ssl:
 	@mkdir -p objs