From 389b9607d6d6e5cefe0159b8e3187d3218529ab4 Mon Sep 17 00:00:00 2001 From: Ben Visness Date: Sat, 22 Jul 2023 18:16:31 -0500 Subject: [PATCH] Use frankensteined angle build for now --- scripts/build_runtime.py | 9 +++------ scripts/checksums.json | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/build_runtime.py b/scripts/build_runtime.py index 1afea6c..1fc9935 100644 --- a/scripts/build_runtime.py +++ b/scripts/build_runtime.py @@ -193,7 +193,8 @@ def build_wasm3(release): if platform.system() == "Windows": build_wasm3_lib_win(release) elif platform.system() == "Darwin": - raise "can't yet build wasm3 on Mac" + log_error("can't yet build wasm3 on Mac") + exit(1) else: log_error(f"can't build wasm3 for unknown platform '{platform.system()}'") exit(1) @@ -330,9 +331,6 @@ def verify_angle(): "milepost/lib/libGLESv2.dll.lib", ] elif platform.system() == "Darwin": - if platform.machine() == "arm64": - log_warning(f"automated ANGLE builds are not yet available for Apple silicon") - return False checkfiles = [ "milepost/lib/libEGL.dylib", "milepost/lib/libGLESv2.dylib", @@ -360,8 +358,7 @@ def download_angle(): build = "windows-2019" extensions = ["dll", "lib"] elif platform.system() == "Darwin": - # TODO(ben): make universal dylibs - build = "macos-12" + build = "macos-jank" extensions = ["dylib"] else: log_error(f"could not automatically download ANGLE for unknown platform {platform.system()}") diff --git a/scripts/checksums.json b/scripts/checksums.json index 3b28389..f5ca541 100644 --- a/scripts/checksums.json +++ b/scripts/checksums.json @@ -1,10 +1,10 @@ { "scripts/files/angle-windows-2019-2023-07-05.zip": "a333b5ccc8462151ee8df65c43cfacd70d9db2413f2e495da65670737b5b2d96", - "scripts/files/angle-macos-12-2023-07-05.zip": "a3422c456278ff037ef89a7808e0ba256d972d4832d5272fc3d4aa4f7912c1e0", + "scripts/files/angle-macos-jank-2023-07-05.zip": "c234b8db179a24757ab9f46610a032123718dd9bed967d2bf8e27d0d17eb0aff", "milepost/lib/libEGL.dll": "b7bf51f83e88129ddc20c0c2cb904ec04c89059a30a2cd29b9b1ea11c80388fb", "milepost/lib/libEGL.dll.lib": "4cec54c534136da413dea86bd271ccb9c5ae88e40aa91d1de7a01e701be8e1d7", "milepost/lib/libGLESv2.dll": "193b53b0a16b702eaa28a73e84527acf7aecfd665e3e3f54a8d9db9ae73111e1", "milepost/lib/libGLESv2.dll.lib": "ee87aac129efe8fe871825d181b85da1b1ea6626cb48be52c2e689f2804b953f", - "milepost/lib/libEGL.dylib": "227445d896047207d1dcef91a8182d886692bc470f402033a6f0831eacb82592", - "milepost/lib/libGLESv2.dylib": "c814948060494796cda4a3febd8652e1bbf0787a69c2f7e9afd41fc666dc91fe" + "milepost/lib/libEGL.dylib": "96baea4b1c8578d30738764784d07b509d1153df694c094faba2ee8ccbfde2a9", + "milepost/lib/libGLESv2.dylib": "98ce9f6248a6447ba9199e96b8f6d87df9548d43ce583a2615717aab168ecb71" }