Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ For more information, please visit <http://www.openshot.org/>.
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules")

################ PROJECT VERSION ####################
set(PROJECT_VERSION_FULL "0.5.0")
set(PROJECT_VERSION_FULL "0.6.0")
set(PROJECT_SO_VERSION 10)

#### Set C++ standard level
Expand Down Expand Up @@ -254,6 +254,22 @@ if(APPLE)
-flax-vector-conversions)
endif()


if(ANDROID)
if(DEFINED ANDROID_NDK)
set(_android_ndk "${ANDROID_NDK}")
elseif(DEFINED CMAKE_ANDROID_NDK)
set(_android_ndk "${CMAKE_ANDROID_NDK}")
endif()
if(_android_ndk)
target_include_directories(openshot-audio PRIVATE
"${_android_ndk}/sources/android/cpufeatures")
target_sources(openshot-audio PRIVATE
"${_android_ndk}/sources/android/cpufeatures/cpu-features.c")
endif()
target_link_libraries(openshot-audio PUBLIC log)
endif()

# ALSA (Linux only)
if(UNIX AND NOT APPLE)
set(NEED_ALSA TRUE)
Expand Down
Loading