From 5e0f3fbeb404d5f13af7ce7d2cb48e389e24b80e Mon Sep 17 00:00:00 2001 From: BroGamer <64546358+BroGamer4256@users.noreply.github.com> Date: Sun, 16 Oct 2022 15:15:46 +1300 Subject: [PATCH] Ensure parallel builds --- .github/workflows/build.yml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5495008..fd5e6b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Setup rust run: rustup target add x86_64-pc-windows-gnu - name: Make - run: make dist-no-7z + run: make dist-no-7z -j - uses: actions/upload-artifact@v2 with: name: dist diff --git a/Makefile b/Makefile index 54b0fb8..07e1d38 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ ${TARGET}/%.o: %.c .PHONY: SDL SDL: @mkdir -p SDL/${SDL_TARGET} - @cd SDL/${SDL_TARGET} && ../configure --build=x86_64-linux-gnu --host=${SDL_TARGET} --disable-sdl2-config --disable-shared --enable-assertions=release --enable-directx --enable-haptic - @make -s -C SDL/${SDL_TARGET} + @cd SDL/${SDL_TARGET} && ../configure -C --build=x86_64-linux-gnu --host=${SDL_TARGET} --disable-sdl2-config --disable-shared --enable-assertions=release --enable-directx --enable-haptic + @make -s -C SDL/${SDL_TARGET} -j .PHONY: ${OUT} ${OUT}: dirs ${DEPS} ${OBJ} @@ -50,8 +50,8 @@ clean: .PHONY: plugins plugins: - make -C plugins/8.18 - make -C plugins/amauth + make -C plugins/8.18 -j + make -C plugins/amauth -j cd plugins/8.18-song-limit && cargo build --release --target x86_64-pc-windows-gnu cp plugins/8.18-song-limit/target/x86_64-pc-windows-gnu/release/song_limit_8_18.dll ${TARGET} strip ${TARGET}/*.dll