diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 94c3207e23d..350ca11b2d7 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Docker Step - run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.74 bash" + run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:4.0.4 bash" # - name: Determine Release # id: vars # shell: bash diff --git a/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk b/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk index fbf727183de..59e285fae08 100644 --- a/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk +++ b/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk @@ -231,7 +231,6 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/curl/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/rtAudio/% -PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/brotli/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/cairo/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/download/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/pixman/% diff --git a/scripts/emscripten/install_emscripten.sh b/scripts/emscripten/install_emscripten.sh index de87c37610d..cecd6d960ec 100755 --- a/scripts/emscripten/install_emscripten.sh +++ b/scripts/emscripten/install_emscripten.sh @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR -VERSION=3.1.74 +VERSION=4.0.4 CHECKOUT=$1