Skip to content

Commit

Permalink
2024.7.0 に対応する
Browse files Browse the repository at this point in the history
  • Loading branch information
melpon committed Aug 29, 2024
1 parent 20a48c5 commit 9684108
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 5 additions & 3 deletions buildbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@ def build_and_install_boost(
architecture,
android_ndk,
native_api_level,
runtime_link=None,
):
version_underscore = version.replace(".", "_")
archive = download(
Expand All @@ -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":
Expand Down Expand Up @@ -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()
Expand All @@ -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":
Expand Down
1 change: 1 addition & 0 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9684108

Please sign in to comment.