Skip to content

Commit 48516e0

Browse files
authored
Merge pull request #168 from OpenShot/release-20260316
Release 0.6.0 libopenshot-audio
2 parents a76e176 + 64c70c3 commit 48516e0

1 file changed

Lines changed: 17 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For more information, please visit <http://www.openshot.org/>.
4040
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules")
4141

4242
################ PROJECT VERSION ####################
43-
set(PROJECT_VERSION_FULL "0.5.0")
43+
set(PROJECT_VERSION_FULL "0.6.0")
4444
set(PROJECT_SO_VERSION 10)
4545

4646
#### Set C++ standard level
@@ -254,6 +254,22 @@ if(APPLE)
254254
-flax-vector-conversions)
255255
endif()
256256

257+
258+
if(ANDROID)
259+
if(DEFINED ANDROID_NDK)
260+
set(_android_ndk "${ANDROID_NDK}")
261+
elseif(DEFINED CMAKE_ANDROID_NDK)
262+
set(_android_ndk "${CMAKE_ANDROID_NDK}")
263+
endif()
264+
if(_android_ndk)
265+
target_include_directories(openshot-audio PRIVATE
266+
"${_android_ndk}/sources/android/cpufeatures")
267+
target_sources(openshot-audio PRIVATE
268+
"${_android_ndk}/sources/android/cpufeatures/cpu-features.c")
269+
endif()
270+
target_link_libraries(openshot-audio PUBLIC log)
271+
endif()
272+
257273
# ALSA (Linux only)
258274
if(UNIX AND NOT APPLE)
259275
set(NEED_ALSA TRUE)

0 commit comments

Comments
 (0)