public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix cmake

This commit is contained in:
Dmytro Bogovych 2021-11-14 17:48:27 +02:00
parent f03f5fad2b
commit 634fc3ac8c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -88,7 +88,6 @@ if (CMAKE_SYSTEM MATCHES "Darwin*")
add_definitions (-DTARGET_OSX) add_definitions (-DTARGET_OSX)
endif() endif()
<<<<<<< ours
if (CMAKE_SYSTEM MATCHES "Android") if (CMAKE_SYSTEM MATCHES "Android")
message("Adding the Oboe library") message("Adding the Oboe library")
set (OBOE_DIR libs/oboe) set (OBOE_DIR libs/oboe)
@ -96,13 +95,10 @@ if (CMAKE_SYSTEM MATCHES "Android")
include_directories (${OBOE_DIR}/include) include_directories (${OBOE_DIR}/include)
endif() endif()
=======
if (USE_MUSL) if (USE_MUSL)
add_definitions(-DTARGET_MUSL) add_definitions(-DTARGET_MUSL)
endif() endif()
>>>>>>> theirs
if (USE_AQUA_LIB) if (USE_AQUA_LIB)
message("Use AQuA library") message("Use AQuA library")
add_definitions( -DUSE_AQUA_LIBRARY ) add_definitions( -DUSE_AQUA_LIBRARY )