From 0f6948fe8a2951159697db147bde6cafb9060e36 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 3 Aug 2022 20:04:41 +0100 Subject: [PATCH] Detect when wasm stuff is unsupported --- deps/Makefile | 9 +++ src/emscripten/shell.html | 138 +++++++++++++++++++++++--------------- 2 files changed, 93 insertions(+), 54 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index c82a263..96b61c9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -144,6 +144,15 @@ CMAKE += -DCMAKE_CXX_COMPILER_AR=$(CMAKE_AR) CMAKE += -DCMAKE_RANLIB=$(CMAKE_RANLIB) CMAKE += -DCMAKE_C_COMPILER_RANLIB=$(CMAKE_RANLIB) CMAKE += -DCMAKE_CXX_COMPILER_RANLIB=$(CMAKE_RANLIB) +ifeq ($(shell uname -s),Darwin) +CMAKE += -DCMAKE_CROSSCOMPILING=ON +CMAKE += -DCMAKE_SYSTEM_NAME=Generic +endif +endif + +# fix cmake forcing SDK for us +ifeq ($(MACOS),true) +CMAKE += -DCMAKE_OSX_SYSROOT="macosx" endif # fix cross-compilation for windows diff --git a/src/emscripten/shell.html b/src/emscripten/shell.html index d886116..8a372f8 100644 --- a/src/emscripten/shell.html +++ b/src/emscripten/shell.html @@ -27,7 +27,7 @@ display: none; image-rendering: pixelated; image-rendering: crisp-edges; - position: absolute; + position: fixed; transform-origin: 0 0 0; transform: scale(calc(1 / var(--device-pixel-ratio))); width: 100vw; @@ -93,6 +93,7 @@
Cardinal
+
Downloading...
@@ -103,68 +104,97 @@
{{{ SCRIPT }}}