Merge pull request #145 from godotengine/emscripten-3.1.63

Update to Emscripten 3.1.63, SCons 4.8.0

Author: akien-mga

Dockerfile.base

@@ -8,6 +8,6 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 RUN dnf -y install --setopt=install_weak_deps=False \
       bash bzip2 curl file findutils gettext git make nano patch pkgconfig python3-pip unzip which xz \
       dotnet-sdk-8.0 && \
-    pip install scons==4.7.0
+    pip install scons==4.8.0
 
 CMD /bin/bash

Dockerfile.web

@@ -1,7 +1,7 @@
 ARG img_version
 FROM godot-fedora:${img_version}
 
-ENV EMSCRIPTEN_VERSION=3.1.62
+ENV EMSCRIPTEN_VERSION=3.1.63
 
 RUN git clone --branch ${EMSCRIPTEN_VERSION} --progress https://github.com/emscripten-core/emsdk && \
     emsdk/emsdk install ${EMSCRIPTEN_VERSION} && \

README.md

@@ -36,14 +36,14 @@ tried we ran into performance issues).
 The `build.sh` script included is used to build the containers themselves.
 
 The two arguments can take any value and are meant to convey what Godot branch
-you are building for (e.g. `4.x`) and what Linux distribution the `Dockerfile.base`
+you are building for (e.g. `4.3`) and what Linux distribution the `Dockerfile.base`
 is based on (e.g. `f40` for Fedora 40).
 
 Run the command using:
 
-    ./build.sh 4.x f40
+    ./build.sh 4.3 f40
 
-The above will generate images using the tag '4.x-f40'.
+The above will generate images using the tag '4.3-f40'.
 You can then specify it in the `build.sh` of
 [godot-build-scripts](https://github.com/godotengine/godot-build-scripts).
 
@@ -65,13 +65,13 @@ you can comment out the corresponding lines from the script:
 These are the expected container image sizes, so you can plan your disk usage in advance:
 
     REPOSITORY                         TAG                SIZE
-    localhost/godot-fedora             4.x-f40            1.20 GB
-    localhost/godot-linux              4.x-f40            3.00 GB
-    localhost/godot-windows            4.x-f40            2.02 GB
-    localhost/godot-web                4.x-f40            2.42 GB
-    localhost/godot-android            4.x-f40            4.48 GB
-    localhost/godot-osx                4.x-f40            4.94 GB
-    localhost/godot-ios                4.x-f40            5.68 GB
+    localhost/godot-fedora             4.3-f40            1.01 GB
+    localhost/godot-linux              4.3-f40            2.80 GB
+    localhost/godot-windows            4.3-f40            2.46 GB
+    localhost/godot-web                4.3-f40            2.41 GB
+    localhost/godot-android            4.3-f40            4.29 GB
+    localhost/godot-osx                4.3-f40            4.78 GB
+    localhost/godot-ios                4.3-f40            5.49 GB
 
 In addition to this, generating containers will also require some host disk space
 (up to 10 GB) for the dependencies (Xcode).
@@ -82,10 +82,12 @@ In addition to this, generating containers will also require some host disk spac
 These are the toolchains currently in use for Godot 4.3 and later:
 
 - Base image: Fedora 40
-- SCons: 4.7.0
+- SCons: 4.8.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.62
+- Windows:
+  * x86_64/x86_32: MinGW 11.0.1, GCC 14.1.1, binutils 2.41
+  * arm64: llvm-mingw 20240619, LLVM 18.1.8
+- Web: Emscripten 3.1.63
 - 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
+- macOS: Xcode 15.4 with Apple Clang (LLVM 16.0.0), MacOSX SDK 14.5
+- iOS: Xcode 15.4 with Apple Clang (LLVM 16.0.0), iPhoneOS SDK 17.5