diff --git a/trunk/3rdparty/usrsctp/Makefile.am b/trunk/3rdparty/usrsctp/Makefile.am index 4bd998fbe70..2e72c8be1af 100644 --- a/trunk/3rdparty/usrsctp/Makefile.am +++ b/trunk/3rdparty/usrsctp/Makefile.am @@ -28,11 +28,7 @@ # SUCH DAMAGE. # -if COND_PROGRAMS -MAYBEPROGRAMS = programs -endif - -SUBDIRS = usrsctplib $(MAYBEPROGRAMS) +SUBDIRS = usrsctplib EXTRA_DIST = bootstrap Makefile.nmake ACLOCAL_AMFLAGS = -I m4 # pkgconfig_DATA = usrsctp.pc diff --git a/trunk/3rdparty/usrsctp/configure.ac b/trunk/3rdparty/usrsctp/configure.ac index cdcd4835711..f0b34ac6026 100644 --- a/trunk/3rdparty/usrsctp/configure.ac +++ b/trunk/3rdparty/usrsctp/configure.ac @@ -126,12 +126,6 @@ if test x$enable_inet6 = xyes; then AC_DEFINE(INET6, 1, [Support IPv6]) fi -AC_ARG_ENABLE(programs, - AC_HELP_STRING( [--enable-programs], - [build example programs @<:@default=yes@:>@]), - enable_programs=$enableval,enable_programs=yes) -AM_CONDITIONAL([COND_PROGRAMS], [test "$enable_programs" = yes]) - AC_CHECK_TYPE(size_t) AC_CHECK_TYPE(ssize_t) @@ -190,5 +184,5 @@ AC_C_BIGENDIAN AC_SUBST([LIBCFLAGS]) AC_SUBST([APPCFLAGS]) dnl AC_CONFIG_FILES([usrsctp.pc]) -AC_CONFIG_FILES(usrsctplib/Makefile programs/Makefile Makefile) +AC_CONFIG_FILES(usrsctplib/Makefile Makefile) AC_OUTPUT diff --git a/trunk/ide/srs_clion/CMakeLists.txt b/trunk/ide/srs_clion/CMakeLists.txt index fbaa133c295..5a3f96f32a9 100755 --- a/trunk/ide/srs_clion/CMakeLists.txt +++ b/trunk/ide/srs_clion/CMakeLists.txt @@ -27,11 +27,11 @@ ProcessorCount(JOBS) # We should always configure SRS for switching between branches. IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") EXECUTE_PROCESS( - COMMAND ./configure --osx --srt=on --gb28181=on --apm=on --h265=on --utest=on --jobs=${JOBS} + COMMAND ./configure --osx --srt=on --sctp=on --gb28181=on --apm=on --h265=on --utest=on --jobs=${JOBS} WORKING_DIRECTORY ${SRS_DIR} RESULT_VARIABLE ret) ELSE () EXECUTE_PROCESS( - COMMAND ./configure --srt=on --gb28181=on --apm=on --h265=on --utest=on --jobs=${JOBS} + COMMAND ./configure --srt=on --sctp=on --gb28181=on --apm=on --h265=on --utest=on --jobs=${JOBS} WORKING_DIRECTORY ${SRS_DIR} RESULT_VARIABLE ret) ENDIF () if(NOT ret EQUAL 0) @@ -46,6 +46,7 @@ set(DEPS_LIBS ${SRS_DIR}/objs/st/libst.a ${SRS_DIR}/objs/ffmpeg/lib/libavutil.a ${SRS_DIR}/objs/opus/lib/libopus.a ${SRS_DIR}/objs/ffmpeg/lib/libswresample.a + ${SRS_DIR}/objs/sctp/lib/libusrsctp.a ${SRS_DIR}/objs/srt/lib/libsrt.a) foreach(DEPS_LIB ${DEPS_LIBS}) IF (NOT EXISTS ${DEPS_LIB}) @@ -62,6 +63,7 @@ INCLUDE_DIRECTORIES(${SRS_DIR}/objs ${SRS_DIR}/objs/openssl/include ${SRS_DIR}/objs/srtp2/include ${SRS_DIR}/objs/ffmpeg/include + ${SRS_DIR}/objs/sctp/include ${SRS_DIR}/objs/srt/include ${SRS_DIR}/src/core ${SRS_DIR}/src/kernel