mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 06:15:58 +00:00
build: run the local macOS build natively, with no emulation (#2999)
build: make the local macOS build run natively, with no emulation On an arm64 Mac the x86/i386 session preloads were built in a linux/amd64 container under emulation, and the Rockstar launcher failed to link against Homebrew's SJLJ i686 mingw. Both now build on the host's own architecture. - build_local.sh: on arm64 build the x86 preloads in a native arm64 Debian bullseye container with the x86_64/i686 cross toolchains (glibc 2.31, as before); x86 hosts keep the native gcc-multilib path. - build-x86-preloads.sh: X86_CROSS=1 selects the cross toolchains. - rockstar-launcher/build-container.sh: build the launcher in a native Ubuntu container with a DWARF2 mingw, used on macOS only. - vr/build.sh: stop aborting silently when ANDROID_NDK_HOME names an NDK that is not installed. - build_local.sh: expand the empty stores_check array safely on bash 3.2 so the script reaches its signing step.
This commit is contained in:
1 parent
378175c6ac
commit
b2687701c1
4 files changed
+73
-23
No files matched your search
+1
-1
@@ -14,7 +14,7 @@ if [ -z "$vkinc" ]; then
|
||||
for ndk in "${ANDROID_NDK_HOME:-}" "${ANDROID_NDK_LATEST_HOME:-}" \
|
||||
$(ls -d "${ANDROID_HOME:-$HOME/Library/Android/sdk}"/ndk/* 2>/dev/null | sort -r); do
|
||||
[ -n "$ndk" ] || continue
|
||||
cand=$(ls -d "$ndk"/toolchains/llvm/prebuilt/*/sysroot/usr/include 2>/dev/null | head -1)
|
||||
cand=$(ls -d "$ndk"/toolchains/llvm/prebuilt/*/sysroot/usr/include 2>/dev/null | head -1 || true)
|
||||
if [ -n "$cand" ] && [ -f "$cand/vulkan/vk_layer.h" ]; then vkinc=$cand; break; fi
|
||||
done
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user