From 0ae8b1cd514786e97211049dca671ac09515d405 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 25 Dec 2023 22:42:53 +0800 Subject: [PATCH] try --- .github/workflows/build.yml | 2 -- vcpkg-overlay/triplets/maa-arm-android.cmake | 4 ++-- vcpkg-overlay/triplets/maa-arm-neon-android.cmake | 14 -------------- vcpkg-overlay/triplets/maa-arm64-android.cmake | 4 ++-- 4 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 vcpkg-overlay/triplets/maa-arm-neon-android.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e915144..fcdd1cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,8 +20,6 @@ jobs: arch: arm64-android - os: ubuntu arch: arm-android - - os: ubuntu - arch: arm-neon-android # clang-17: error: unsupported argument 'i686' to option '-march=' # https://github.com/MaaAssistantArknights/MaaDeps/actions/runs/7285060481/job/19851366697 # - os: ubuntu diff --git a/vcpkg-overlay/triplets/maa-arm-android.cmake b/vcpkg-overlay/triplets/maa-arm-android.cmake index 5e8760e..2425fb6 100644 --- a/vcpkg-overlay/triplets/maa-arm-android.cmake +++ b/vcpkg-overlay/triplets/maa-arm-android.cmake @@ -1,5 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE arm) -set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(VCPKG_BUILD_TYPE release) @@ -7,7 +8,6 @@ set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} -DANDROID_ABI=armeabi-v7a -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF - -DANDROID_STL=c++_static -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s") include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake) diff --git a/vcpkg-overlay/triplets/maa-arm-neon-android.cmake b/vcpkg-overlay/triplets/maa-arm-neon-android.cmake deleted file mode 100644 index 4c9a0ee..0000000 --- a/vcpkg-overlay/triplets/maa-arm-neon-android.cmake +++ /dev/null @@ -1,14 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_CMAKE_SYSTEM_VERSION 23) -set(VCPKG_BUILD_TYPE release) -set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") -set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} - -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON - -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF - -DANDROID_STL=c++_static - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s") - -include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/maa-android-library-override.cmake) diff --git a/vcpkg-overlay/triplets/maa-arm64-android.cmake b/vcpkg-overlay/triplets/maa-arm64-android.cmake index c280e9f..77a0209 100644 --- a/vcpkg-overlay/triplets/maa-arm64-android.cmake +++ b/vcpkg-overlay/triplets/maa-arm64-android.cmake @@ -1,5 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(VCPKG_BUILD_TYPE release) @@ -7,7 +8,6 @@ set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} -DANDROID_ABI=arm64-v8a -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF - -DANDROID_STL=c++_static -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s") include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake)