Commit f296dba9 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build of iSAC with CMake.

parent 926a6438
...@@ -56,8 +56,15 @@ include_directories( ...@@ -56,8 +56,15 @@ include_directories(
${MEDIASTREAMER2_INCLUDE_DIRS} ${MEDIASTREAMER2_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
webrtc webrtc
webrtc/common_audio/signal_processing/include
) )
if(ENABLE_AECM)
set(BUILD_AEC 1)
endif()
if(ENABLE_ISAC)
set(BUILD_ISAC 1)
endif()
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
if(WIN32) if(WIN32)
add_definitions(-DWEBRTC_WIN) add_definitions(-DWEBRTC_WIN)
...@@ -68,7 +75,7 @@ if(UNIX) ...@@ -68,7 +75,7 @@ if(UNIX)
else() else()
add_definitions(-DWEBRTC_LINUX -DWEBRTC_THREAD_RR) add_definitions(-DWEBRTC_LINUX -DWEBRTC_THREAD_RR)
endif() endif()
endif(() endif()
set(WEBRTC_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/webrtc/common_audio/signal_processing") set(WEBRTC_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/webrtc/common_audio/signal_processing")
...@@ -124,7 +131,6 @@ if(ENABLE_AECM) ...@@ -124,7 +131,6 @@ if(ENABLE_AECM)
) )
include_directories( include_directories(
${AEC_SRC_DIR}/include ${AEC_SRC_DIR}/include
webrtc/common_audio/signal_processing/include
webrtc/modules/audio_processing/utility webrtc/modules/audio_processing/utility
webrtc/system_wrappers/interface webrtc/system_wrappers/interface
) )
......
...@@ -30,3 +30,6 @@ ...@@ -30,3 +30,6 @@
#cmakedefine VERSION "@VERSION@" #cmakedefine VERSION "@VERSION@"
#cmakedefine HAVE_MEDIASTREAMER2_MSCOMMON_H #cmakedefine HAVE_MEDIASTREAMER2_MSCOMMON_H
#cmakedefine BUILD_AEC
#cmakedefine BUILD_ISAC
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment