Upstream merged librem to libre
This commit is contained in:
@@ -20,10 +20,6 @@ set(re_DIR ${distribution_DIR}/re/cmake)
|
|||||||
find_package(re CONFIG REQUIRED HINTS ${distribution_DIR}/re/cmake)
|
find_package(re CONFIG REQUIRED HINTS ${distribution_DIR}/re/cmake)
|
||||||
add_definitions(${RE_DEFINITIONS})
|
add_definitions(${RE_DEFINITIONS})
|
||||||
|
|
||||||
add_library(lib_rem STATIC IMPORTED)
|
|
||||||
set_target_properties(lib_rem PROPERTIES IMPORTED_LOCATION
|
|
||||||
${distribution_DIR}/rem/lib/${ANDROID_ABI}/librem.a)
|
|
||||||
|
|
||||||
add_library(lib_opus STATIC IMPORTED)
|
add_library(lib_opus STATIC IMPORTED)
|
||||||
set_target_properties(lib_opus PROPERTIES IMPORTED_LOCATION
|
set_target_properties(lib_opus PROPERTIES IMPORTED_LOCATION
|
||||||
${distribution_DIR}/opus/lib/${ANDROID_ABI}/libopus.a)
|
${distribution_DIR}/opus/lib/${ANDROID_ABI}/libopus.a)
|
||||||
@@ -73,7 +69,6 @@ add_library(baresip SHARED baresip.c)
|
|||||||
target_include_directories(baresip PRIVATE
|
target_include_directories(baresip PRIVATE
|
||||||
${distribution_DIR}/openssl/include
|
${distribution_DIR}/openssl/include
|
||||||
${distribution_DIR}/re/include
|
${distribution_DIR}/re/include
|
||||||
${distribution_DIR}/rem/include
|
|
||||||
${distribution_DIR}/baresip/include)
|
${distribution_DIR}/baresip/include)
|
||||||
|
|
||||||
add_definitions(-DHAVE_PTHREAD)
|
add_definitions(-DHAVE_PTHREAD)
|
||||||
@@ -82,7 +77,6 @@ target_link_libraries(baresip
|
|||||||
android
|
android
|
||||||
OpenSLES
|
OpenSLES
|
||||||
lib_baresip
|
lib_baresip
|
||||||
lib_rem
|
|
||||||
lib_re
|
lib_re
|
||||||
lib_ssl
|
lib_ssl
|
||||||
lib_crypto
|
lib_crypto
|
||||||
|
|||||||
Reference in New Issue
Block a user