diff --git a/vcpkg-overlay/triplets/maa-android-library-override.cmake b/vcpkg-overlay/triplets/maa-android-library-override.cmake index 4796fcd..f933b50 100644 --- a/vcpkg-overlay/triplets/maa-android-library-override.cmake +++ b/vcpkg-overlay/triplets/maa-android-library-override.cmake @@ -8,3 +8,7 @@ if (PORT MATCHES "curl") string(APPEND VCPKG_C_FLAGS "-Wno-error=implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS "-Wno-error=implicit-function-declaration") endif() +if (NOT PORT MATCHES "libiconv") + message("add -DANDROID_STL=c++_static for ${PORT}") + set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} "-DANDROID_STL=c++_static") +endif() diff --git a/vcpkg-overlay/triplets/maa-arm-android.cmake b/vcpkg-overlay/triplets/maa-arm-android.cmake index 2425fb6..731aa28 100644 --- a/vcpkg-overlay/triplets/maa-arm-android.cmake +++ b/vcpkg-overlay/triplets/maa-arm-android.cmake @@ -1,6 +1,5 @@ set(VCPKG_TARGET_ARCHITECTURE arm) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(VCPKG_BUILD_TYPE release) diff --git a/vcpkg-overlay/triplets/maa-arm64-android.cmake b/vcpkg-overlay/triplets/maa-arm64-android.cmake index 77a0209..fc36712 100644 --- a/vcpkg-overlay/triplets/maa-arm64-android.cmake +++ b/vcpkg-overlay/triplets/maa-arm64-android.cmake @@ -1,6 +1,5 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(VCPKG_BUILD_TYPE release)