From a21db1b4aadc52cca479d6ae5108f16b414c016d Mon Sep 17 00:00:00 2001 From: Nick Chan Date: Mon, 30 Jan 2023 22:33:02 +0800 Subject: [PATCH] dep download in makefile --- .github/workflows/build.yml | 14 ++------------ Makefile | 10 +++++----- src/Makefile | 9 +++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 728266e..dee955f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,12 +43,7 @@ jobs: - name: Download dependencies (embedded binaries) run: | - cd src - curl -LOOO https://github.com/guacaplushy/checkp4le/raw/main/binaries/checkra1n-kpf-pongo \ - https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg \ - https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg - cd .. - make -j5 download-checkra1n + make -j5 download-deps echo "SDK=$(xcrun -sdk ${{ matrix.os }} --show-sdk-path)" >> $GITHUB_ENV - name: Download dependencies (source code) @@ -429,12 +424,7 @@ jobs: - name: Download dependencies (embedded binaries) run: | - cd src - curl -LOOO https://github.com/guacaplushy/checkp4le/raw/main/binaries/checkra1n-kpf-pongo \ - https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg \ - https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg - cd .. - make -j5 download-checkra1n + make -j5 download-deps - name: Download dependencies (source code) run: | diff --git a/Makefile b/Makefile index a99e58e..bb2b195 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ ifeq ($(TARGET_OS),) TARGET_OS = $(shell uname -s) endif ifeq ($(TARGET_OS),Darwin) -ifeq (,$(findstring version-min=, $(CFLAGS))) +ifeq (,$(findstring version-min=, $(CFLAGS))) CFLAGS += -mmacosx-version-min=10.8 endif LDFLAGS += -Wl,-dead_strip @@ -34,17 +34,17 @@ export SRC DEP CC CFLAGS LDFLAGS LIBS TARGET_OS DEV_BUILD all: palera1n -palera1n: download-checkra1n +palera1n: download-deps $(MAKE) -C src clean: $(MAKE) -C src clean -download-checkra1n: - $(MAKE) -C src checkra1n-macos checkra1n-linux-arm64 checkra1n-linux-armel checkra1n-linux-x86 checkra1n-linux-x86_64 +download-deps: + $(MAKE) -C src checkra1n-macos checkra1n-linux-arm64 checkra1n-linux-armel checkra1n-linux-x86 checkra1n-linux-x86_64 checkra1n-kpf-pongo ramdisk.dmg binpack.dmg distclean: clean - rm -rf palera1n-* palera1n*.dSYM src/checkra1n-* + rm -rf palera1n-* palera1n*.dSYM src/checkra1n-* src/checkra1n-kpf-pongo src/ramdisk.dmg src/binpack.dmg .PHONY: all palera1n clean diff --git a/src/Makefile b/src/Makefile index 8ed1738..abbb179 100644 --- a/src/Makefile +++ b/src/Makefile @@ -53,6 +53,15 @@ ifneq (,$(findstring version-min=, $(CFLAGS))) endif endif +checkra1n-kpf-pongo: + curl -LO https://github.com/guacaplushy/checkp4le/raw/main/binaries/checkra1n-kpf-pongo + +ramdisk.dmg: + curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg + +binpack.dmg: + curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg + clean: rm -rf *.o palera1n checkra1n checkra1n.c palera1n.dSYM