Merge pull request #5 from aa889788/master

添加range-v3，修复android构建错误，修复onnxruntime错误
MaaAssistantArknights · Mar 9, 2023 · 045f5ca · 045f5ca
2 parents 89657fd + b3f72ef
commit 045f5ca
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/maadeps.cmake b/maadeps.cmake
@@ -38,7 +38,7 @@ if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}")
     " or maadeps-build.py to build from source\n"
   )
 endif()
-list(PREPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}")
+list(PREPEND CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}")
 
 function(maadeps_install)
   install(DIRECTORY "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/runtime/${MAADEPS_TRIPLET}/" DESTINATION . USE_SOURCE_PERMISSIONS)

diff --git a/maadeps/runtime_android.py b/maadeps/runtime_android.py
@@ -19,7 +19,6 @@ def split_debug(file, debug_file):
     objcopy = subprocess.check_output([ndk_which, "objcopy"]).decode().strip()
     objcopy = os.environ.get("OBJCOPY", objcopy)
     subprocess.check_call([objcopy, "--only-keep-debug", "--", file, temp_debug_file])
-    subprocess.check_call([objcopy, "--strip-unneeded", "--add-gnu-debuglink=" + str(temp_debug_file), "--", file])
     shutil.move(temp_debug_file, debug_file)
 
 def is_elf(file):

diff --git a/vcpkg-overlay/ports/onnx/portfile.cmake b/vcpkg-overlay/ports/onnx/portfile.cmake
@@ -39,6 +39,7 @@ vcpkg_cmake_configure(
         -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
         -DONNX_BUILD_TESTS=OFF
         -DONNX_BUILD_BENCHMARKS=OFF
+        -DONNX_DISABLE_STATIC_REGISTRATION=ON
     MAYBE_UNUSED_VARIABLES
         ONNX_USE_MSVC_STATIC_RUNTIME
 )

diff --git a/vcpkg-overlay/triplets/maa-arm64-android.cmake b/vcpkg-overlay/triplets/maa-arm64-android.cmake
@@ -3,6 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_CMAKE_SYSTEM_VERSION 23)
 set(VCPKG_BUILD_TYPE release)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF)
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF
+                                    -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s")
 
 include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake.inc)
diff --git a/vcpkg.json b/vcpkg.json
@@ -31,6 +31,10 @@
     },
     "maa-fastdeploy",
     "zlib",
-    "asio"
+    "asio",
+    {
+      "name": "range-v3",
+      "platform": "osx | android"
+    }
   ]
 }