diff --git a/app/build.gradle b/app/build.gradle index 0b11cba9..ede529bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,7 @@ android { cppFlags '-std=c++17 -fexceptions -Wno-error=format-security' // cppFlags '-std=c++17 -Wno-error=format-security' // arguments "-DANDROID_STL=c++_shared" - arguments "-DNCNN_DISABLE_EXCEPTION=OFF", "-DTERM_CORE_ROOT=" + coreroot, "-DOpenCV_DIR=" + opencvsdk + "/sdk/native/jni", "-DASIO_ROOT=" + asioroot, "-DEVPP_ROOT=" + evpproot, "-DNCNN_ROOT=" + ncnnroot + arguments "-DNCNN_DISABLE_EXCEPTION=OFF", "-DTERM_CORE_ROOT=" + coreroot, "-DOpenCV_DIR=" + opencvsdk + "/sdk/native/jni", "-DHDRPLUS_ROOT=" + hdrplusroot, "-DNCNN_ROOT=" + ncnnroot // abiFilters 'arm64-v8a', 'armeabi-v7a' // setAbiFilters(['arm64-v8a']) } diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index c995b4ea..861543bb 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -70,6 +70,11 @@ find_package(ncnn REQUIRED) # include(mars/src/CMakeUtils.txt) +include_directories(${HDRPLUS_ROOT}/${ANDROID_ABI}/include) +link_directories(${HDRPLUS_ROOT}/${ANDROID_ABI}/lib) + +SET(HDRPLUS_LIBS hdrplus) + SET(YAMC_INC_DIR ${CMAKE_SOURCE_DIR}) # SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core) @@ -359,7 +364,7 @@ target_link_libraries( # Specifies the target library. android camera2ndk mediandk z - ncnn ${OpenCV_LIBS} sqlite3 + ncnn ${OpenCV_LIBS} sqlite3 ${HDRPLUS_LIBS} ) diff --git a/gradle.properties b/gradle.properties index da72833b..2e376b9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,11 +24,8 @@ TARGET_SDK_VERSION=28 COMPILE_MIN_SDK_VERSION=25 opencvsdk=D:/Workspace/deps/opencv-mobile-4.9.0-android -# opencvsdk=D:/Workspace/deps/opencv-mobile-3.4.20-android coreroot=D:/Workspace/Github/xymp/xymp/Core -# opencvsdk=D:/Workspace/deps/opencv-v5 -asioroot=D:/Workspace/deps/asio-1.28.0 -evpproot=D:/Workspace/Github/evpp +hdrplusroot=D:/Workspace/deps/hdrplus ncnnroot=D:/Workspace/deps/ncnn-20240410-android-vulkan # ncnnroot=D:/Workspace/deps/ncnn-20230517-android-vulkan libzipsdkroot=D:/Workspace/deps/libzip-android-sdk