diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md index 2bc8159914..ad4110b82a 100644 --- a/BUILD_ANDROID.md +++ b/BUILD_ANDROID.md @@ -93,7 +93,7 @@ From the soxr directory, use cmake, along with the `android.toolchain.cmake` fil The full set of commands to build soxr for Android is shown below. It is a long command, make sure you copy the entire command (up to `-DBUILD_TESTS=0`). ``` -cmake -DCMAKE_TOOLCHAIN_FILE=$FULL_PATH_TO_TOOLCHAIN -DCMAKE_INSTALL_PREFIX=. -DBUILD_SHARED_LIBS=OFF -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 -DBUILD_TESTS=0 +cmake -DCMAKE_TOOLCHAIN_FILE=$FULL_PATH_TO_TOOLCHAIN -DCMAKE_INSTALL_PREFIX=. -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 -DBUILD_TESTS=0 make make install ``` diff --git a/cmake/modules/FindSoxr.cmake b/cmake/modules/FindSoxr.cmake index ab5ba83796..367022e9ec 100644 --- a/cmake/modules/FindSoxr.cmake +++ b/cmake/modules/FindSoxr.cmake @@ -22,20 +22,9 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake") hifi_library_search_hints("soxr") find_path(SOXR_INCLUDE_DIRS soxr.h PATH_SUFFIXES include HINTS ${SOXR_SEARCH_DIRS}) - -if (ANDROID) - set(SOXR_NAMES "libsoxr.a") -elseif () - set(SOXR_NAMES "soxr") -endif () - -find_library(SOXR_LIBRARIES NAMES ${SOXR_NAMES} PATH_SUFFIXES lib HINTS ${SOXR_SEARCH_DIRS}) +find_library(SOXR_LIBRARIES NAMES soxr PATH_SUFFIXES lib HINTS ${SOXR_SEARCH_DIRS}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SOXR DEFAULT_MSG SOXR_INCLUDE_DIRS SOXR_LIBRARIES) -if (ANDROID) - set(SOXR_LIBRARIES ${SOXR_LIBRARIES} "-fopenmp") -endif () - mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS) \ No newline at end of file