public_mirrors
/
build-containers
mirror of https://github.com/godotengine/build-containers.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #143 from godotengine/web-emscripten-fix-threads+dlink 

Web: Update to Emscripten 3.1.62 which includes the previously backported patch
This commit is contained in:
Rémi Verschelde 2024-07-05 12:26:26 +02:00 committed by GitHub
parent 5647636750 5d179cbe94
commit d2be7490bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile.web
View File

@ -1,13 +1,10 @@
ARG img_version
FROM godot-fedora:${img_version}
ENV EMSCRIPTEN_VERSION=3.1.61
ENV EMSCRIPTEN_VERSION=3.1.62
RUN git clone --branch ${EMSCRIPTEN_VERSION} --progress https://github.com/emscripten-core/emsdk && \
emsdk/emsdk install ${EMSCRIPTEN_VERSION} && \
emsdk/emsdk activate ${EMSCRIPTEN_VERSION} && \
cd emsdk/upstream/emscripten && \
curl -LO https://github.com/emscripten-core/emscripten/pull/19496.patch && \
patch -p1 < 19496.patch
emsdk/emsdk activate ${EMSCRIPTEN_VERSION}
CMD /bin/bash

2
README.md
View File

@ -85,7 +85,7 @@ These are the toolchains currently in use for Godot 4.3 and later:
- SCons: 4.7.0
- Linux: GCC 13.2.0 built against glibc 2.28, binutils 2.40, from our own [Linux SDK](https://github.com/godotengine/buildroot)
- Windows: MinGW 11.0.1, GCC 14.1.1, binutils 2.41
- Web: Emscripten 3.1.61
- Web: Emscripten 3.1.62
- Android: Android NDK 23.2.8568313, build-tools 34.0.0, platform android-34, CMake 3.22.1, JDK 17
- macOS: Xcode 15.5 with Apple Clang (LLVM 16.0.0), MacOSX SDK 14.5
- iOS: Xcode 15.5 with Apple Clang (LLVM 16.0.0), iPhoneOS SDK 17.5