diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 380e6a7..e67c70d 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -9,7 +9,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: ps2dev/ps2dev:latest + container: ps2dev/ps2dev:v1.2.0 steps: - name: Install dependencies run: | @@ -18,7 +18,7 @@ jobs: - run: | git config --global --add safe.directory /__w/VTSPS2-CRC32/VTSPS2-CRC32 git fetch --prune --unshallow - - name: Compile HBDL + - name: Compile VTSPS2-CRC32 run: | make @@ -31,7 +31,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: HomeBrewDownloader-${{ steps.slug.outputs.sha8 }} - path: VTSPS2-CRCGS.ELF + path: VTSPS2-CRCGS-packed.elf - name: Create release if: github.ref == 'refs/heads/master' @@ -40,4 +40,4 @@ jobs: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "latest" title: "Latest development build" - files: VTSPS2-CRCGS.ELF + files: VTSPS2-CRCGS-packed.elf diff --git a/Makefile b/Makefile index 1ea1650..0a33ba0 100644 --- a/Makefile +++ b/Makefile @@ -10,20 +10,17 @@ # VERSION = 0.1 NAME = VTSPS2-CRCGS -EE_BIN = $(NAME).ELF -EE_BIN_PACKED = $(NAME)-packed.ELF -EE_BIN_STRIPPED = $(NAME)-stripped.ELF - -EE_OBJS = VTSPS2-CRCGS.o crc32.o VTSPS2-CRC32.o +EE_BIN = $(NAME).elf +EE_BIN_PACKED = $(NAME)-packed.elf +EE_BIN_STRIPPED = $(NAME)-stripped.elf EE_LIBS += -lc -ldebug -lpatches -lgskit_toolkit -lgskit -ldmakit - EE_INCS += -I$(GSKIT)/include -I$(GSKIT)/ee/dma/include -I$(GSKIT)/ee/gs/include -I$(GSKIT)/ee/toolkit/include -# linker flags EE_LIB_DIRS += -L$(GSKIT)/lib EE_LIB_DIRS += -L$(PS2SDK)/ee/lib -EE_LDFLAGS += -Wl,--allow-multiple-definition $(EE_LIB_DIRS) -EE_CFLAGS += -Wno-pointer-sign -Wno-implicit-function-declaration -Wno-strict-aliasing -Wno-format-overflow -Wno-format-truncation +EE_LDFLAGS += $(EE_LIB_DIRS) +EE_OBJS = VTSPS2-CRCGS.o crc32.o VTSPS2-CRC32.o + all: @echo "=======================================" @echo "=== Building $(NAME) v$(VERSION) ===" diff --git a/VTSPS2-CRCGS.c b/VTSPS2-CRCGS.c index ea5946a..0d2eb0f 100644 --- a/VTSPS2-CRCGS.c +++ b/VTSPS2-CRCGS.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) //78..95..112 int rownumber = 0; int rowoffset = 0; - gsKit_fontm_print_scaled(gsGlobal, gsFontM, 10, 10, 1, 0.6f,TealFont, "libcrc for PS2 0.24 written by VTSTech\ncrc32 routines written by Lammert Bies\n=====================www.VTS-Tech.org="); + gsKit_fontm_print_scaled(gsGlobal, gsFontM, 10, 10, 1, 0.6f,TealFont, "libcrc for PS2 0.25 written by VTSTech\ncrc32 routines written by Lammert Bies\n=====================www.VTS-Tech.org="); rownumber = 3; char* str = ""; char* fnl = "Filename: ";