Commit a764528d authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into isar_bitstream_format_update

parents 2e41b036 30f763ad

scripts/binauralRenderer_interface/CMakeLists.txt

+7 −2
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ set(IVAS_TRUNK_DEC_PATH ${IVAS_TRUNK_PATH}/lib_dec) 
set(IVAS_TRUNK_REND_PATH ${IVAS_TRUNK_PATH}/lib_rend)

set(IVAS_TRUNK_ENC_PATH ${IVAS_TRUNK_PATH}/lib_enc)

set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com)

set(IVAS_TRUNK_ISAR_PATH ${IVAS_TRUNK_PATH}/lib_isar)

set(IVAS_TRUNK_LC3_PATH ${IVAS_TRUNK_PATH}/lib_lc3plus)

set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug)



option(USE_MATLAB_ENG "Use matlab engine" OFF) # allows to use sofa file as input to the exe, but on windows requires to register matlab as a com server type in matlab "comserver('register')""
@@ -27,7 +29,8 @@ message("Matlab_MX_LIBRARY = ${Matlab_MX_LIBRARY}") 
message("Matlab_MEX_LIBRARY = ${Matlab_MEX_LIBRARY}")

message("Matlab_ENGINE_LIBRARY = ${Matlab_ENGINE_LIBRARY}")

message("Matlab_DATAARRAY_LIBRARY = ${Matlab_DATAARRAY_LIBRARY}")

include_directories(${Matlab_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH})

include_directories(${Matlab_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_ISAR_PATH} ${IVAS_TRUNK_LC3_PATH} ${IVAS_TRUNK_DEBUG_PATH})



if(USE_MATLAB_ENG)

    string(REPLACE "mex" "eng" Matlab_ENG_LIBRARY ${Matlab_MEX_LIBRARY})

    add_definitions(-DUSE_MATLAB_ENG)
@@ -71,9 +74,11 @@ add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H}) 
add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c)



target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib ${Matlab_MAT_LIBRARY} ${Matlab_MX_LIBRARY})



if(UNIX AND NOT APPLE)

    target_link_libraries(${PROJECT_NAME} libstdc++.so.6 -lm -ldl)

endif()



if(USE_MATLAB_ENG)

    target_link_libraries(${PROJECT_NAME} ${Matlab_ENG_LIBRARY})

endif()

scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ set(IVAS_ENC_PATH ${IVAS_PATH}/lib_enc) 
set(IVAS_COM_PATH ${IVAS_PATH}/lib_com)

set(IVAS_REND_PATH ${IVAS_PATH}/lib_rend)

set(IVAS_DEBUG_PATH ${IVAS_PATH}/lib_debug)

set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lc3plus)

set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lib_lc3plus)

set(IVAS_ISAR_PATH ${IVAS_PATH}/lib_isar)



include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH})

include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH} ${IVAS_ISAR_PATH})



set(SOURCE_FILES_C

  ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.c
@@ -40,4 +41,3 @@ add_executable(${PROJECT_NAME} generate_tables_from_rom_to_bin.c) 
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib)



add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:${PROJECT_NAME}>" "${CMAKE_CURRENT_SOURCE_DIR}/")