forked from MaaAssistantArknights/MaaDeps
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
24 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
vcpkg-overlay/triplets/maa-android-library-override.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| if(PORT MATCHES "onnxruntime") | ||
| message("add -Wno-error=shorten-64-to-32 for ${PORT}") | ||
| string(APPEND VCPKG_C_FLAGS "-Wno-error=shorten-64-to-32") | ||
| string(APPEND VCPKG_CXX_FLAGS "-Wno-error=shorten-64-to-32") | ||
| endif() | ||
| if (PORT MATCHES "curl") | ||
| message("add -Wno-error=implicit-function-declaration for ${PORT}") | ||
| string(APPEND VCPKG_C_FLAGS "-Wno-error=implicit-function-declaration") | ||
| string(APPEND VCPKG_CXX_FLAGS "-Wno-error=implicit-function-declaration") | ||
| endif() | ||
| # if(PORT MATCHES "onnxruntime") | ||
| # message("add -Wno-error=shorten-64-to-32 for ${PORT}") | ||
| # string(APPEND VCPKG_C_FLAGS "-Wno-error=shorten-64-to-32") | ||
| # string(APPEND VCPKG_CXX_FLAGS "-Wno-error=shorten-64-to-32") | ||
| # endif() | ||
| # if (PORT MATCHES "curl") | ||
| # message("add -Wno-error=implicit-function-declaration for ${PORT}") | ||
| # string(APPEND VCPKG_C_FLAGS "-Wno-error=implicit-function-declaration") | ||
| # string(APPEND VCPKG_CXX_FLAGS "-Wno-error=implicit-function-declaration") | ||
| # endif() |
This file was deleted.
Oops, something went wrong.
26 changes: 13 additions & 13 deletions
26
vcpkg-overlay/triplets/maa-arm-android.cmake → vcpkg-overlay/triplets/maa-x64-android.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| 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_USE_LEGACY_TOOLCHAIN_FILE=OFF | ||
| -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) | ||
| set(VCPKG_TARGET_ARCHITECTURE x64) | ||
| 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=x64-linux-android") | ||
| set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} | ||
| -DANDROID_ABI=x86_64 | ||
| -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF | ||
| -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) |