-
-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Install the Emscripten toolchain via emsdk (instead of a separate Doc…
…ker image) Allows more architecture flexibility (the emsdk installer supports arm64, but the images published do not, see emscripten-core/emsdk#1206) and makes it much easier to update to newer versions. As part of this we use the most recent version of Emscripten that has arm64 support (3.1.33), jumping from 2.0.34. Updates #178
- Loading branch information
Showing
2 changed files
with
17 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,17 @@ | ||
FROM ghcr.io/mihaip/emscripten-devcontainer:2.0.34 | ||
RUN apt update && apt install -y autoconf libsdl1.2-dev wget lzip | ||
FROM ubuntu:22.04 | ||
|
||
RUN apt update && apt install -y \ | ||
python3 cmake git build-essential \ | ||
autoconf libsdl1.2-dev wget lzip | ||
|
||
# Emscripten still does not release arm64 versions of their Docker images | ||
# (https://github.com/emscripten-core/emsdk/issues/1206) so we need to install | ||
# the SDK manually. | ||
RUN git clone https://github.com/emscripten-core/emsdk.git \ | ||
&& cd emsdk \ | ||
&& ./emsdk install 3.1.33 \ | ||
&& ./emsdk activate 3.1.33 \ | ||
&& echo "source $(pwd)/emsdk_env.sh" >> $HOME/.bashrc | ||
|
||
COPY macemu/BasiliskII/src/Unix/_em_build_mpfr.sh /tmp/_em_build_mpfr.sh | ||
RUN /tmp/_em_build_mpfr.sh | ||
RUN /tmp/_em_build_mpfr.sh |
Submodule macemu
updated
4 files
+3 −0 | BasiliskII/src/CrossPlatform/vm_alloc.cpp | |
+2 −0 | BasiliskII/src/Unix/_em_build_mpfr.sh | |
+1 −1 | BasiliskII/src/Unix/configure.ac | |
+1 −7 | SheepShaver/src/Unix/configure.ac |