Skip to content
Draft
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ android.min.sdk=21
kotlin.mpp.enableCInteropCommonization=true
kotlin.incremental.native=true
kotlin.apple.xcodeCompatibility.nowarn=true
kotlin.native.ignoreDisabledTargets=true
org.gradle.console=plain
kotlin.suppressGradlePluginWarnings=UnusedSourceSetsWarning
25 changes: 12 additions & 13 deletions mediamp-mpv/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,14 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libmpv/include")
link_directories(${MPV_LIB_PATH})

if (NOT ANDROID)
set(JAVA_AWT_LIBRARY NotNeeded) # todo
set(JAVA_JVM_LIBRARY NotNeeded) # todo
# set(JAVA_AWT_LIBRARY NotNeeded) # todo
# set(JAVA_JVM_LIBRARY NotNeeded) # todo
find_package(JNI REQUIRED)
include_directories(${JNI_INCLUDE_DIRS})

find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
add_compile_definitions(USE_GLEW=1)
endif()

set(SRC_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp")
Expand All @@ -85,6 +89,8 @@ add_library(${PROJECT_NAME} SHARED
"${SRC_PREFIX}/include/mpv_handle_t.h"
"${SRC_PREFIX}/mpv_handle_t.cpp"
"${SRC_PREFIX}/jni.cpp"
"${SRC_PREFIX}/opengl_extra.cpp"
"${SRC_PREFIX}/offscreen.cpp"
)
target_include_directories(${PROJECT_NAME} PRIVATE "${SRC_PREFIX}/include")

Expand All @@ -96,21 +102,15 @@ if (ANDROID)
"${MPV_LIB_PATH}/${MPV_LIB_EXTERNAL_SWSCALE_NAME}"
"${MPV_LIB_PATH}/${MPV_LIB_NAME}")
else()
# 假设 JNI_INCLUDE_DIRS 是一个包含多个路径的列表
set(FILTERED_JNI_LIBRARIES "")

# 遍历 JNI_INCLUDE_DIRS,移除包含 "NotNeeded" 的值
foreach(dir ${JNI_LIBRARIES})
if(NOT dir MATCHES "NotNeeded")
list(APPEND FILTERED_JNI_LIBRARIES ${dir})
endif()
endforeach()
set(FILTERED_JNI_LIBRARIES ${JNI_LIBRARIES})

target_link_libraries(${PROJECT_NAME} PRIVATE
${FILTERED_JNI_LIBRARIES}
"${MPV_LIB_PATH}/${MPV_LIB_EXTERNAL_AVCODEC_NAME}"
"${MPV_LIB_PATH}/${MPV_LIB_EXTERNAL_SWSCALE_NAME}"
"${MPV_LIB_PATH}/${MPV_LIB_NAME}")
"${MPV_LIB_PATH}/${MPV_LIB_NAME}"
${OPENGL_gl_LIBRARY}
GLEW::GLEW)
endif()

# 查找所有动态库文件
Expand All @@ -136,6 +136,5 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
${MPV_OUTPUT_LIBS_DIR}
)


message(STATUS "MPV library path: ${MPV_LIB_PATH}")
message(STATUS "MPV library name: ${MPV_LIB_NAME}")
3 changes: 3 additions & 0 deletions mediamp-mpv/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ plugins {
kotlin("multiplatform")
id("com.android.library")

kotlin("plugin.compose")
id("org.jetbrains.compose")

`mpp-lib-targets`
id(libs.plugins.vanniktech.mavenPublish.get().pluginId)
idea
Expand Down
Loading
Loading