From 96841085b3f22d6a019c7a1d085af252b00b57db Mon Sep 17 00:00:00 2001
From: melpon <shigemasa7watanabe+github@gmail.com>
Date: Fri, 30 Aug 2024 00:13:28 +0900
Subject: [PATCH] =?UTF-8?q?2024.7.0=20=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildbase.py | 8 +++++---
 run.py       | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildbase.py b/buildbase.py
index b91e070b..96879d8d 100644
--- a/buildbase.py
+++ b/buildbase.py
@@ -649,6 +649,7 @@ def build_and_install_boost(
     architecture,
     android_ndk,
     native_api_level,
+    runtime_link=None,
 ):
     version_underscore = version.replace(".", "_")
     archive = download(
@@ -659,7 +660,8 @@ def build_and_install_boost(
     with cd(os.path.join(build_dir, "boost")):
         bootstrap = ".\\bootstrap.bat" if target_os == "windows" else "./bootstrap.sh"
         b2 = "b2" if target_os == "windows" else "./b2"
-        runtime_link = "static" if target_os == "windows" else "shared"
+        if runtime_link is None:
+            runtime_link = "static" if target_os == "windows" else "shared"
 
         # Windows かつ Boost 1.85.0 の場合はパッチを当てる
         if target_os == "windows" and version == "1.85.0":
@@ -1565,7 +1567,7 @@ def _check_platform_target(self, p: PlatformTarget):
         elif p.os in ("ios", "android"):
             self._check(p.arch is None)
         else:
-            self._check(p.arch in ("x86_64", "arm64"))
+            self._check(p.arch in ("x86_64", "arm64", "hololens2"))
 
     def __init__(self, target_os, target_osver, target_arch):
         build = get_build_platform()
@@ -1575,7 +1577,7 @@ def __init__(self, target_os, target_osver, target_arch):
         self._check_platform_target(target)
 
         if target.os == "windows":
-            self._check(target.arch == "x86_64")
+            self._check(target.arch in ("x86_64", "arm64", "hololens2"))
             self._check(build.os == "windows")
             self._check(build.arch == "x86_64")
         if target.os == "macos":
diff --git a/run.py b/run.py
index 827195d7..0f90fa2c 100644
--- a/run.py
+++ b/run.py
@@ -241,6 +241,7 @@ def install_deps(
                 install_boost_args["architecture"] = "x86"
             else:
                 install_boost_args["architecture"] = "arm"
+                install_boost_args["runtime_link"] = "shared"
         elif platform.target.os == "macos":
             sysroot = cmdcap(["xcrun", "--sdk", "macosx", "--show-sdk-path"])
             install_boost_args["target_os"] = "darwin"