Fix build for bb10.

CMakeLists.txt

@@ -269,17 +269,15 @@ endif()
 
 
 include_directories(
-	include/
-	src/audiofilters/
-	src/utils/
+	include
+	src/audiofilters
+	src/utils
+	src/voip
 	${CMAKE_CURRENT_BINARY_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}/src/
+	${CMAKE_CURRENT_BINARY_DIR}/src
 	${ORTP_INCLUDE_DIRS}
 )
 
-if(ENABLE_VIDEO)
-	include_directories(src/voip)
-endif()
 if(SRTP_FOUND)
 	include_directories(${SRTP_INCLUDE_DIRS})
 endif()

cmake/FindOpus.cmake

@@ -46,6 +46,17 @@ find_library(OPUS_LIBRARIES
 	PATH_SUFFIXES bin lib
 )
 
+if(OPUS_LIBRARIES)
+	find_library(LIBM
+		NAMES m
+		HINTS _OPUS_ROOT_PATHS
+		PATH_SUFFIXES bin lib
+	)
+	if(LIBM)
+		list(APPEND OPUS_LIBRARIES ${LIBM})
+	endif()
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Opus
 	DEFAULT_MSG