From 871049933ff4bb7257ca82e66cb2ea9d3f026b17 Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Thu, 9 Jan 2025 15:00:35 -0600 Subject: [PATCH] Switch to ninja --- emscripten/Dockerfile | 2 +- emscripten/build_emscripten.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/emscripten/Dockerfile b/emscripten/Dockerfile index a9d493de37..6ffdca80b5 100644 --- a/emscripten/Dockerfile +++ b/emscripten/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/library/fedora:41 AS builder -RUN dnf update -y && dnf install -y git cmake make gcc g++ nlohmann-json-devel autoreconf libtool openssl-devel libcurl-devel fontconfig-devel libzip-devel SDL2-devel flac-devel libvorbis-devel zip speexdsp-devel +RUN dnf update -y && dnf install -y git cmake make gcc g++ nlohmann-json-devel autoreconf libtool openssl-devel libcurl-devel fontconfig-devel libzip-devel SDL2-devel flac-devel libvorbis-devel zip speexdsp-devel ninja-build WORKDIR / diff --git a/emscripten/build_emscripten.sh b/emscripten/build_emscripten.sh index 9138ce6dc4..3b1904df99 100755 --- a/emscripten/build_emscripten.sh +++ b/emscripten/build_emscripten.sh @@ -134,6 +134,7 @@ build_assets fi emcmake cmake ../ \ + -G Ninja \ -DDISABLE_NETWORK=ON \ -DDISABLE_HTTP=ON \ -DDISABLE_TTF=ON \ @@ -150,7 +151,7 @@ emcmake cmake ../ \ -DEMSCRIPTEN_FLAGS="-s USE_SDL=2 -s USE_BZIP2=1 -s USE_LIBPNG=1 -pthread -O3" \ -DEMSCRIPTEN_LDFLAGS="-Wno-pthreads-mem-growth -s ASYNCIFY -s FULL_ES3 -s SAFE_HEAP=0 -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s INITIAL_MEMORY=2GB -s MAX_WEBGL_VERSION=2 -s PTHREAD_POOL_SIZE=120 -pthread -s EXPORTED_RUNTIME_METHODS=FS,callMain,UTF8ToString,stringToNewUTF8 -lidbfs.js --use-preload-plugins -s MODULARIZE=1 -s 'EXPORT_NAME=\"OPENRCT2_WEB\"'" -emmake make -j$(nproc) +emmake ninja -j$(nproc) rm -rf www/ mkdir -p www/