diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d52180..fc040e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,6 @@ list(TRANSFORM TESTS_SOURCES PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/test/) set(CMAKE_REQUIRED_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/usrsctp/usrsctplib") add_subdirectory(usrsctp EXCLUDE_FROM_ALL) -set(sctp_inet ON) -set(sctp_inet6 ON) # Set include directory and custom options to make usrsctp compile with recent g++ target_include_directories(usrsctp-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/usrsctp/usrsctplib) diff --git a/Makefile b/Makefile index 72e009b..281a68f 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ LDLIBS= -lgnutls $(shell pkg-config --libs glib-2.0 gobject-2.0 nice) INCLUDES=-Iinclude/rtc -I$(USRSCTP_DIR)/usrsctplib $(shell pkg-config --cflags glib-2.0 gobject-2.0 nice) USRSCTP_DIR:=usrsctp -USRSCTP_DEFINES:=-DINET -DINET6 SRCS=$(shell printf "%s " src/*.cpp) OBJS=$(subst .cpp,.o,$(SRCS)) @@ -19,7 +18,7 @@ OBJS=$(subst .cpp,.o,$(SRCS)) all: $(NAME).a $(NAME).so tests src/%.o: src/%.cpp - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(USRSCTP_DEFINES) -MMD -MP -o $@ -c $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -MMD -MP -o $@ -c $< test/%.o: test/%.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) -Iinclude -MMD -MP -o $@ -c $<