From 33a342751aec48e06ac546e4f470c9292549355f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 16 Oct 2025 19:23:55 +1000 Subject: [PATCH] Deps: Remove build directory after each library Hopefully work around running out of space on the runners. --- .../deps/build-dependencies-linux-cross.sh | 23 ++++++++++++++++++ scripts/deps/build-dependencies-linux.sh | 24 +++++++++++++++++++ scripts/deps/build-dependencies-mac.sh | 23 ++++++++++++++++++ .../deps/build-dependencies-windows-arm64.bat | 23 ++++++++++++++++++ .../deps/build-dependencies-windows-x64.bat | 23 ++++++++++++++++++ 5 files changed, 116 insertions(+) diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh index dc86702ac..79be2e39f 100755 --- a/scripts/deps/build-dependencies-linux-cross.sh +++ b/scripts/deps/build-dependencies-linux-cross.sh @@ -194,6 +194,7 @@ CFLAGS="-fmacro-prefix-map=\"${PWD}\"=. -ffile-prefix-map=\"${PWD}\"=." ./config make make install cd .. +rm -fr "libbacktrace-$LIBBACKTRACE_COMMIT" echo "Building libpng..." rm -fr "libpng-$LIBPNG" @@ -204,6 +205,7 @@ cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=O cmake --build build --parallel ninja -C build install cd .. +rm -fr "libpng-$LIBPNG" echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" @@ -213,6 +215,7 @@ cmake "${CMAKE_COMMON[@]}" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ni cmake --build build --parallel ninja -C build install cd .. +rm -fr "libjpeg-turbo-$LIBJPEGTURBO" echo "Building Zstandard..." rm -fr "zstd-$ZSTD" @@ -222,6 +225,7 @@ cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_ cmake --build build --parallel ninja -C build install cd .. +rm -fr "zstd-$ZSTD" echo "Building WebP..." rm -fr "libwebp-$LIBWEBP" @@ -233,6 +237,7 @@ cmake "${CMAKE_COMMON[@]}" -B build -G Ninja \ cmake --build build --parallel ninja -C build install cd .. +rm -fr "libwebp-$LIBWEBP" echo "Building libzip..." rm -fr "libzip-$LIBZIP" @@ -245,6 +250,7 @@ cmake "${CMAKE_COMMON[@]}" -B build -G Ninja \ cmake --build build --parallel ninja -C build install cd .. +rm -fr "libzip-$LIBZIP" echo "Building FreeType..." rm -fr "freetype-$FREETYPE" @@ -255,6 +261,7 @@ cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQU cmake --build build --parallel ninja -C build install cd .. +rm -fr "freetype-$FREETYPE" echo "Building HarfBuzz..." rm -fr "harfbuzz-$HARFBUZZ" @@ -264,6 +271,7 @@ cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build cmake --build build --parallel ninja -C build install cd .. +rm -fr "harfbuzz-$HARFBUZZ" echo "Building SDL..." rm -fr "SDL3-$SDL3" @@ -273,6 +281,7 @@ cmake -B build "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL cmake --build build --parallel ninja -C build install cd .. +rm -fr "SDL3-$SDL3" # Couple notes: # -fontconfig is needed otherwise Qt Widgets render only boxes. @@ -291,6 +300,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtbase-everywhere-src-$QT" echo "Building Qt SVG..." rm -fr "qtsvg-everywhere-src-$QT" @@ -302,6 +312,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtsvg-everywhere-src-$QT" echo "Building Qt Image Formats..." rm -fr "qtimageformats-everywhere-src-$QT" @@ -313,6 +324,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtimageformats-everywhere-src-$QT" echo "Building Qt Wayland..." rm -fr "qtwayland-everywhere-src-$QT" @@ -324,6 +336,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtwayland-everywhere-src-$QT" echo "Building Qt Shader Tools..." rm -fr "qtshadertools-everywhere-src-$QT" @@ -335,6 +348,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtshadertools-everywhere-src-$QT" echo "Building Qt Declarative..." rm -fr "qtdeclarative-everywhere-src-$QT" @@ -346,6 +360,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtdeclarative-everywhere-src-$QT" echo "Installing Qt Tools..." rm -fr "qttools-everywhere-src-$QT" @@ -381,6 +396,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qttools-everywhere-src-$QT" echo "Installing Qt Translations..." rm -fr "qttranslations-everywhere-src-$QT" @@ -392,6 +408,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qttranslations-everywhere-src-$QT" echo "Building shaderc..." rm -fr "shaderc-$SHADERC_COMMIT" @@ -401,6 +418,7 @@ cmake "${CMAKE_COMMON[@]}" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -D cmake --build build --parallel ninja -C build install cd .. +rm -fr "shaderc-$SHADERC_COMMIT" echo "Building SPIRV-Cross..." cd SPIRV-Cross @@ -408,6 +426,7 @@ rm -fr build cmake "${CMAKE_COMMON[@]}" -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_STATIC=OFF -DSPIRV_CROSS_CLI=OFF -DSPIRV_CROSS_ENABLE_TESTS=OFF -DSPIRV_CROSS_ENABLE_GLSL=ON -DSPIRV_CROSS_ENABLE_HLSL=OFF -DSPIRV_CROSS_ENABLE_MSL=OFF -DSPIRV_CROSS_ENABLE_CPP=OFF -DSPIRV_CROSS_ENABLE_REFLECT=OFF -DSPIRV_CROSS_ENABLE_C_API=ON -DSPIRV_CROSS_ENABLE_UTIL=ON -B build -G Ninja cmake --build build --parallel ninja -C build install +rm -fr build cd .. echo "Building cpuinfo..." @@ -418,6 +437,7 @@ cmake "${CMAKE_COMMON[@]}" -DCPUINFO_LIBRARY_TYPE=shared -DCPUINFO_RUNTIME_TYPE= cmake --build build --parallel ninja -C build install cd .. +rm -fr "cpuinfo-$CPUINFO_COMMIT" echo "Building discord-rpc..." rm -fr "discord-rpc-$DISCORD_RPC_COMMIT" @@ -427,6 +447,7 @@ cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build -G Ninja cmake --build build --parallel ninja -C build install cd .. +rm -fr "discord-rpc-$DISCORD_RPC_COMMIT" echo "Building plutosvg..." rm -fr "plutosvg-$PLUTOSVG_COMMIT" @@ -436,6 +457,7 @@ cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON cmake --build build --parallel ninja -C build install cd .. +rm -fr "plutosvg-$PLUTOSVG_COMMIT" echo "Building soundtouch..." rm -fr "soundtouch-$SOUNDTOUCH_COMMIT" @@ -445,6 +467,7 @@ cmake "${CMAKE_COMMON[@]}" -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -B build -G N cmake --build build --parallel ninja -C build install cd .. +rm -fr "soundtouch-$SOUNDTOUCH_COMMIT" if [ "$SKIP_CLEANUP" != true ]; then echo "Cleaning up..." diff --git a/scripts/deps/build-dependencies-linux.sh b/scripts/deps/build-dependencies-linux.sh index 71077c7e8..00c311157 100755 --- a/scripts/deps/build-dependencies-linux.sh +++ b/scripts/deps/build-dependencies-linux.sh @@ -120,6 +120,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "zlib-ng-$ZLIBNG" echo "Building libbacktrace..." rm -fr "libbacktrace-$LIBBACKTRACE_COMMIT" @@ -129,6 +130,7 @@ CFLAGS="-fmacro-prefix-map=\"${PWD}\"=. -ffile-prefix-map=\"${PWD}\"=." ./config make make install cd .. +rm -fr "libbacktrace-$LIBBACKTRACE_COMMIT" echo "Building libpng..." rm -fr "libpng-$LIBPNG" @@ -139,6 +141,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "libpng-$LIBPNG" echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" @@ -148,6 +151,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "libjpeg-turbo-$LIBJPEGTURBO" echo "Building Zstandard..." rm -fr "zstd-$ZSTD" @@ -157,6 +161,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "zstd-$ZSTD" echo "Building WebP..." rm -fr "libwebp-$LIBWEBP" @@ -168,6 +173,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "libwebp-$LIBWEBP" echo "Building libzip..." rm -fr "libzip-$LIBZIP" @@ -180,6 +186,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "libzip-$LIBZIP" echo "Building FreeType..." rm -fr "freetype-$FREETYPE" @@ -190,6 +197,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "freetype-$FREETYPE" echo "Building HarfBuzz..." rm -fr "harfbuzz-$HARFBUZZ" @@ -199,6 +207,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "harfbuzz-$HARFBUZZ" echo "Building SDL..." rm -fr "SDL3-$SDL3" @@ -208,6 +217,7 @@ cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCM cmake --build build --parallel ninja -C build install cd .. +rm -fr "SDL3-$SDL3" # Couple notes: # -fontconfig is needed otherwise Qt Widgets render only boxes. @@ -226,6 +236,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtbase-everywhere-src-$QT" echo "Building Qt SVG..." rm -fr "qtsvg-everywhere-src-$QT" @@ -237,6 +248,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtsvg-everywhere-src-$QT" echo "Building Qt Image Formats..." rm -fr "qtimageformats-everywhere-src-$QT" @@ -248,6 +260,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtimageformats-everywhere-src-$QT" echo "Building Qt Wayland..." rm -fr "qtwayland-everywhere-src-$QT" @@ -259,6 +272,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtwayland-everywhere-src-$QT" echo "Building Qt Shader Tools..." rm -fr "qtshadertools-everywhere-src-$QT" @@ -270,6 +284,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtshadertools-everywhere-src-$QT" echo "Building Qt Declarative..." rm -fr "qtdeclarative-everywhere-src-$QT" @@ -281,6 +296,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qtdeclarative-everywhere-src-$QT" echo "Installing Qt Tools..." rm -fr "qttools-everywhere-src-$QT" @@ -316,6 +332,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qttools-everywhere-src-$QT" echo "Installing Qt Translations..." rm -fr "qttranslations-everywhere-src-$QT" @@ -327,6 +344,7 @@ cd build cmake --build . --parallel ninja install cd ../../ +rm -fr "qttranslations-everywhere-src-$QT" echo "Building shaderc..." rm -fr "shaderc-$SHADERC_COMMIT" @@ -336,6 +354,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "shaderc-$SHADERC_COMMIT" echo "Building SPIRV-Cross..." cd SPIRV-Cross @@ -343,6 +362,7 @@ rm -fr build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_STATIC=OFF -DSPIRV_CROSS_CLI=OFF -DSPIRV_CROSS_ENABLE_TESTS=OFF -DSPIRV_CROSS_ENABLE_GLSL=ON -DSPIRV_CROSS_ENABLE_HLSL=OFF -DSPIRV_CROSS_ENABLE_MSL=OFF -DSPIRV_CROSS_ENABLE_CPP=OFF -DSPIRV_CROSS_ENABLE_REFLECT=OFF -DSPIRV_CROSS_ENABLE_C_API=ON -DSPIRV_CROSS_ENABLE_UTIL=ON -B build -G Ninja cmake --build build --parallel ninja -C build install +rm -fr build cd .. echo "Building cpuinfo..." @@ -353,6 +373,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "cpuinfo-$CPUINFO_COMMIT" echo "Building discord-rpc..." rm -fr "discord-rpc-$DISCORD_RPC_COMMIT" @@ -362,6 +383,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "discord-rpc-$DISCORD_RPC_COMMIT" echo "Building plutosvg..." rm -fr "plutosvg-$PLUTOSVG_COMMIT" @@ -371,6 +393,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "plutosvg-$PLUTOSVG_COMMIT" echo "Building soundtouch..." rm -fr "soundtouch-$SOUNDTOUCH_COMMIT" @@ -380,6 +403,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTA cmake --build build --parallel ninja -C build install cd .. +rm -fr "soundtouch-$SOUNDTOUCH_COMMIT" if [ "$SKIP_CLEANUP" != true ]; then echo "Cleaning up..." diff --git a/scripts/deps/build-dependencies-mac.sh b/scripts/deps/build-dependencies-mac.sh index c01bcee75..bf95cccd7 100755 --- a/scripts/deps/build-dependencies-mac.sh +++ b/scripts/deps/build-dependencies-mac.sh @@ -135,6 +135,7 @@ make -C build-arm64 "-j$NPROCS" merge_binaries $(realpath build) $(realpath build-arm64) make -C build install cd .. +rm -fr "libpng-$LIBPNG" echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" @@ -147,6 +148,7 @@ make -C build-arm64 "-j$NPROCS" merge_binaries $(realpath build) $(realpath build-arm64) make -C build install cd .. +rm -fr "libjpeg-turbo-$LIBJPEGTURBO" echo "Installing Zstd..." rm -fr "zstd-$ZSTD" @@ -159,6 +161,7 @@ make -C build-dir-arm64 "-j$NPROCS" merge_binaries $(realpath build-dir) $(realpath build-dir-arm64) make -C build-dir install cd .. +rm -fr "zstd-$ZSTD" echo "Installing WebP..." rm -fr "libwebp-$LIBWEBP" @@ -175,6 +178,7 @@ make -C build-arm64 "-j$NPROCS" merge_binaries $(realpath build) $(realpath build-arm64) make -C build install cd .. +rm -fr "libwebp-$LIBWEBP" echo "Installing libzip..." rm -fr "libzip-$LIBZIP" @@ -187,6 +191,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -B build \ cmake --build build --parallel cmake --install build cd .. +rm -fr "libzip-$LIBZIP" echo "Building FreeType..." rm -fr "freetype-$FREETYPE" @@ -197,6 +202,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DFT_R cmake --build build --parallel cmake --install build cd .. +rm -fr "freetype-$FREETYPE" echo "Building HarfBuzz..." rm -fr "harfbuzz-$HARFBUZZ" @@ -206,6 +212,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_B cmake --build build --parallel cmake --install build cd .. +rm -fr "harfbuzz-$HARFBUZZ" echo "Installing SDL..." rm -fr "SDL3-$SDL3" @@ -215,6 +222,7 @@ cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_SHARED=ON -DSD make -C build "-j$NPROCS" make -C build install cd .. +rm -fr "SDL3-$SDL3" echo "Installing FFmpeg..." rm -fr "ffmpeg-$FFMPEG_VERSION" @@ -250,6 +258,7 @@ merge_binaries $(realpath build) $(realpath build-arm64) cd build make install cd ../.. +rm -fr "ffmpeg-$FFMPEG_VERSION" # MoltenVK already builds universal binaries, nothing special to do here. echo "Installing MoltenVK..." @@ -260,6 +269,7 @@ cd "MoltenVK-${MOLTENVK}" make macos cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/" cd .. +rm -fr "MoltenVK-${MOLTENVK}" echo "Installing Qt Base..." rm -fr "qtbase-everywhere-src-$QT" @@ -299,6 +309,7 @@ cmake -B build "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}" -DFEATURE_dbus=OFF - make -C build "-j$NPROCS" make -C build install cd .. +rm -fr "qtbase-everywhere-src-$QT" echo "Installing Qt SVG..." rm -fr "qtsvg-everywhere-src-$QT" @@ -310,6 +321,7 @@ cd build make "-j$NPROCS" make install cd ../.. +rm -fr "qtsvg-everywhere-src-$QT" echo "Installing Qt Image Formats..." rm -fr "qtimageformats-everywhere-src-$QT" @@ -321,6 +333,7 @@ cd build make "-j$NPROCS" make install cd ../.. +rm -fr "qtimageformats-everywhere-src-$QT" echo "Installing Qt Shader Tools..." rm -fr "qtshadertools-everywhere-src-$QT" @@ -332,6 +345,7 @@ cd build make "-j$NPROCS" make install cd ../.. +rm -fr "qtshadertools-everywhere-src-$QT" echo "Installing Qt Declarative..." rm -fr "qtdeclarative-everywhere-src-$QT" @@ -343,6 +357,7 @@ cd build make "-j$NPROCS" make install cd ../.. +rm -fr "qtdeclarative-everywhere-src-$QT" echo "Installing Qt Tools..." rm -fr "qttools-everywhere-src-$QT" @@ -354,6 +369,7 @@ cd build make "-j$NPROCS" make install cd ../.. +rm -fr "qttools-everywhere-src-$QT" echo "Installing Qt Translations..." rm -fr "qttranslations-everywhere-src-$QT" @@ -365,6 +381,7 @@ cd build make "-j$NPROCS" make install cd ../.. +rm -fr "qttranslations-everywhere-src-$QT" echo "Building shaderc..." rm -fr "shaderc-$SHADERC_COMMIT" @@ -374,6 +391,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHA make -C build "-j$NPROCS" make -C build install cd .. +rm -fr "shaderc-$SHADERC_COMMIT" echo "Building SPIRV-Cross..." cd SPIRV-Cross @@ -381,6 +399,7 @@ rm -fr build cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_STATIC=OFF -DSPIRV_CROSS_CLI=OFF -DSPIRV_CROSS_ENABLE_TESTS=OFF -DSPIRV_CROSS_ENABLE_GLSL=ON -DSPIRV_CROSS_ENABLE_HLSL=OFF -DSPIRV_CROSS_ENABLE_MSL=ON -DSPIRV_CROSS_ENABLE_CPP=OFF -DSPIRV_CROSS_ENABLE_REFLECT=OFF -DSPIRV_CROSS_ENABLE_C_API=ON -DSPIRV_CROSS_ENABLE_UTIL=ON -B build cmake --build build --parallel cmake --install build +rm -fr build cd .. echo "Building cpuinfo..." @@ -394,6 +413,7 @@ make -C build-arm64 "-j$NPROCS" merge_binaries $(realpath build) $(realpath build-arm64) make -C build install cd .. +rm -fr "cpuinfo-$CPUINFO_COMMIT" echo "Building discord-rpc..." rm -fr "discord-rpc-$DISCORD_RPC_COMMIT" @@ -403,6 +423,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -B bui cmake --build build --parallel cmake --install build cd .. +rm -fr "discord-rpc-$DISCORD_RPC_COMMIT" echo "Building plutosvg..." rm -fr "plutosvg-$PLUTOSVG_COMMIT" @@ -412,6 +433,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DPLUT cmake --build build --parallel cmake --install build cd .. +rm -fr "plutosvg-$PLUTOSVG_COMMIT" echo "Building soundtouch..." rm -fr "soundtouch-$SOUNDTOUCH_COMMIT" @@ -421,6 +443,7 @@ cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DCMAKE_INTERPROCEDURAL_OPTIM cmake --build build --parallel cmake --install build cd .. +rm -fr "soundtouch-$SOUNDTOUCH_COMMIT" echo "Cleaning up..." cd .. diff --git a/scripts/deps/build-dependencies-windows-arm64.bat b/scripts/deps/build-dependencies-windows-arm64.bat index 923eb9876..aa8e4a29f 100644 --- a/scripts/deps/build-dependencies-windows-arm64.bat +++ b/scripts/deps/build-dependencies-windows-arm64.bat @@ -102,6 +102,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "zlib-ng-%ZLIBNG%" echo Building libpng... rmdir /S /Q "libpng-%LIBPNG%" @@ -112,6 +113,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libpng-%LIBPNG%" echo Building libjpeg... rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%" @@ -121,6 +123,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%" echo Building Zstandard... rmdir /S /Q "zstd-%ZSTD%" @@ -130,6 +133,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "zstd-%ZSTD%" echo Building WebP... rmdir /S /Q "libwebp-%LIBWEBP%" @@ -139,6 +143,7 @@ cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=" cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libwebp-%LIBWEBP%" echo Building libzip... rmdir /S /Q "libzip-%LIBZIP%" @@ -148,6 +153,7 @@ cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=" cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libzip-%LIBZIP%" echo Building FreeType... rmdir /S /Q "freetype-%FREETYPE%" @@ -158,6 +164,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "freetype-%FREETYPE%" echo Building HarfBuzz... rmdir /S /Q "harfbuzz-%HARFBUZZ%" @@ -167,6 +174,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "harfbuzz-%HARFBUZZ%" echo Building SDL... rmdir /S /Q "SDL3-%SDL3%" @@ -178,6 +186,7 @@ cmake --build build --parallel || goto error ninja -C build install || goto error copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error cd .. || goto error +rmdir /S /Q "SDL3-%SDL3%" if %DEBUG%==1 ( set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config" @@ -197,6 +206,7 @@ cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTA cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "qtbase-everywhere-src-%QT%" echo Building Qt SVG... rmdir /S /Q "qtsvg-everywhere-src-%QT%" @@ -208,6 +218,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtsvg-everywhere-src-%QT%" echo Building Qt Image Formats... rmdir /S /Q "qtimageformats-everywhere-src-%QT%" @@ -219,6 +230,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtimageformats-everywhere-src-%QT%" echo Building Qt Shader Tools... rmdir /S /Q "qtshadertools-everywhere-src-%QT%" @@ -230,6 +242,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtshadertools-everywhere-src-%QT%" echo Building Qt Declarative... rmdir /S /Q "qtdeclarative-everywhere-src-%QT%" @@ -241,6 +254,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtdeclarative-everywhere-src-%QT%" echo Building Qt Tools... rmdir /S /Q "qtimageformats-everywhere-src-%QT%" @@ -252,6 +266,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtimageformats-everywhere-src-%QT%" echo Building Qt Translations... rmdir /S /Q "qttranslations-everywhere-src-%QT%" @@ -263,6 +278,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qttranslations-everywhere-src-%QT%" echo Building shaderc... rmdir /S /Q "shaderc-%SHADERC_COMMIT%" @@ -272,6 +288,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "shaderc-%SHADERC_COMMIT%" echo Building SPIRV-Cross... cd SPIRV-Cross || goto error @@ -279,6 +296,7 @@ rmdir /S /Q "build" cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_STATIC=OFF -DSPIRV_CROSS_CLI=OFF -DSPIRV_CROSS_ENABLE_TESTS=OFF -DSPIRV_CROSS_ENABLE_GLSL=ON -DSPIRV_CROSS_ENABLE_HLSL=ON -DSPIRV_CROSS_ENABLE_MSL=OFF -DSPIRV_CROSS_ENABLE_CPP=OFF -DSPIRV_CROSS_ENABLE_REFLECT=OFF -DSPIRV_CROSS_ENABLE_C_API=ON -DSPIRV_CROSS_ENABLE_UTIL=ON -B build -G Ninja cmake --build build --parallel || goto error ninja -C build install || goto error +rmdir /S /Q "build" cd .. || goto error echo Building cpuinfo... @@ -289,6 +307,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "cpuinfo-%CPUINFO_COMMIT%" echo Building discord-rpc... rmdir /S /Q "discord-rpc-%DISCORD_RPC_COMMIT%" @@ -298,6 +317,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "discord-rpc-%DISCORD_RPC_COMMIT%" echo Building plutosvg... rmdir /S /Q "plutosvg-%PLUTOSVG_COMMIT%" @@ -307,6 +327,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "plutosvg-%PLUTOSVG_COMMIT%" rem This currently isn't using clang-cl. It probably should, might be losing a little speed. echo Building soundtouch... @@ -317,6 +338,7 @@ cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLD cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "soundtouch-%SOUNDTOUCH_COMMIT%" rem These should already exist, but just in case. mkdir "%INSTALLDIR%\bin" @@ -332,6 +354,7 @@ copy build\native\include\* "%INSTALLDIR%\include" || goto error copy build\native\bin\arm64\*.dll "%INSTALLDIR%\bin" || goto error copy build\native\lib\arm64\*.lib "%INSTALLDIR%\lib" || goto error cd .. || goto error +rmdir /S /Q "dxcompiler-%DXCOMPILER_VERSION%" echo Cleaning up... cd .. diff --git a/scripts/deps/build-dependencies-windows-x64.bat b/scripts/deps/build-dependencies-windows-x64.bat index 7feb3e054..8a5e16977 100644 --- a/scripts/deps/build-dependencies-windows-x64.bat +++ b/scripts/deps/build-dependencies-windows-x64.bat @@ -99,6 +99,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "zlib-ng-%ZLIBNG%" echo Building libpng... rmdir /S /Q "libpng-%LIBPNG%" @@ -109,6 +110,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libpng-%LIBPNG%" echo Building libjpeg... rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%" @@ -118,6 +120,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%" echo Building Zstandard... rmdir /S /Q "zstd-%ZSTD%" @@ -127,6 +130,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "zstd-%ZSTD%" echo Building WebP... rmdir /S /Q "libwebp-%LIBWEBP%" @@ -136,6 +140,7 @@ cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DC cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libwebp-%LIBWEBP%" echo Building libzip... rmdir /S /Q "libzip-%LIBZIP%" @@ -145,6 +150,7 @@ cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DC cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "libzip-%LIBZIP%" echo Building FreeType... rmdir /S /Q "freetype-%FREETYPE%" @@ -155,6 +161,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +tar -xf "freetype-%FREETYPE%.tar.gz" || goto error echo Building HarfBuzz... rmdir /S /Q "harfbuzz-%HARFBUZZ%" @@ -164,6 +171,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "harfbuzz-%HARFBUZZ%" echo Building SDL... rmdir /S /Q "SDL3-%SDL3%" @@ -175,6 +183,7 @@ cmake --build build --parallel || goto error ninja -C build install || goto error copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error cd .. || goto error +rmdir /S /Q "SDL3-%SDL3%" if %DEBUG%==1 ( set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config" @@ -197,6 +206,7 @@ cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "qtbase-everywhere-src-%QT%" echo Building Qt SVG... rmdir /S /Q "qtsvg-everywhere-src-%QT%" @@ -208,6 +218,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtsvg-everywhere-src-%QT%" echo Building Qt Image Formats... rmdir /S /Q "qtimageformats-everywhere-src-%QT%" @@ -219,6 +230,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtimageformats-everywhere-src-%QT%" echo Building Qt Shader Tools... rmdir /S /Q "qtshadertools-everywhere-src-%QT%" @@ -230,6 +242,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtshadertools-everywhere-src-%QT%" echo Building Qt Declarative... rmdir /S /Q "qtdeclarative-everywhere-src-%QT%" @@ -241,6 +254,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtdeclarative-everywhere-src-%QT%" echo Building Qt Tools... rmdir /S /Q "qtimageformats-everywhere-src-%QT%" @@ -252,6 +266,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_ cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qtimageformats-everywhere-src-%QT%" echo Building Qt Translations... rmdir /S /Q "qttranslations-everywhere-src-%QT%" @@ -263,6 +278,7 @@ call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX cmake --build . --parallel || goto error ninja install || goto error cd ..\.. || goto error +rmdir /S /Q "qttranslations-everywhere-src-%QT%" echo Building shaderc... rmdir /S /Q "shaderc-%SHADERC_COMMIT%" @@ -272,6 +288,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "shaderc-%SHADERC_COMMIT%" echo Building SPIRV-Cross... cd SPIRV-Cross || goto error @@ -279,6 +296,7 @@ rmdir /S /Q "build" cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_STATIC=OFF -DSPIRV_CROSS_CLI=OFF -DSPIRV_CROSS_ENABLE_TESTS=OFF -DSPIRV_CROSS_ENABLE_GLSL=ON -DSPIRV_CROSS_ENABLE_HLSL=ON -DSPIRV_CROSS_ENABLE_MSL=OFF -DSPIRV_CROSS_ENABLE_CPP=OFF -DSPIRV_CROSS_ENABLE_REFLECT=OFF -DSPIRV_CROSS_ENABLE_C_API=ON -DSPIRV_CROSS_ENABLE_UTIL=ON -B build -G Ninja cmake --build build --parallel || goto error ninja -C build install || goto error +rmdir /S /Q "build" cd .. || goto error echo Building cpuinfo... @@ -289,6 +307,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "cpuinfo-%CPUINFO_COMMIT%" echo Building discord-rpc... rmdir /S /Q "discord-rpc-%DISCORD_RPC_COMMIT%" @@ -298,6 +317,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "discord-rpc-%DISCORD_RPC_COMMIT%" echo Building plutosvg... rmdir /S /Q "plutosvg-%PLUTOSVG_COMMIT%" @@ -307,6 +327,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "plutosvg-%PLUTOSVG_COMMIT%" echo Building soundtouch... rmdir /S /Q "soundtouch-%SOUNDTOUCH_COMMIT%" @@ -316,6 +337,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +rmdir /S /Q "soundtouch-%SOUNDTOUCH_COMMIT%" rem These should already exist, but just in case. mkdir "%INSTALLDIR%\bin" @@ -331,6 +353,7 @@ copy build\native\include\* "%INSTALLDIR%\include" || goto error copy build\native\bin\x64\*.dll "%INSTALLDIR%\bin" || goto error copy build\native\lib\x64\*.lib "%INSTALLDIR%\lib" || goto error cd .. || goto error +rmdir /S /Q "dxcompiler-%DXCOMPILER_VERSION%" echo Cleaning up... cd ..