Skip to content

Commit

Permalink
fix compile error
Browse files Browse the repository at this point in the history
  • Loading branch information
duiniuluantanqin authored and johzzy committed Apr 9, 2023
1 parent 95bb7c2 commit 3905d83
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
6 changes: 1 addition & 5 deletions trunk/3rdparty/usrsctp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 1 addition & 7 deletions trunk/3rdparty/usrsctp/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
6 changes: 4 additions & 2 deletions trunk/ide/srs_clion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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})
Expand All @@ -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
Expand Down

0 comments on commit 3905d83

Please sign in to comment.