Fix build failed.

pull/908/head
winlin 8 years ago
parent 1bf99e8f3e
commit 121eadbc07

@ -2,10 +2,10 @@
general: general:
branches: branches:
only: only:
- 3.0release
- 2.0release - 2.0release
- develop - develop
- master - master
- bms
- /feature\/.*/ - /feature\/.*/
- /hotfix\/.*/ - /hotfix\/.*/
- /release\/.*/ - /release\/.*/

@ -70,9 +70,9 @@ endif
# for ssl or nossl # for ssl or nossl
ifeq ($(HANDSHAKE), SSL) ifeq ($(HANDSHAKE), SSL)
SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a 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)
ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes)
SRS_LIBSSL_L = -lssl -lcrypto SRS_LIBSSL_L = -lssl -lcrypto
endif
endif endif
ssl: ssl:

Loading…
Cancel
Save