From c5c8e90417e171634861c6c9049a2b339a08b516 Mon Sep 17 00:00:00 2001 From: ABelliqueux Date: Sun, 28 Nov 2021 20:16:48 +0100 Subject: [PATCH] Add Win build action --- .github/workflows/windows-build.yml | 26 ++++++++++++++++++++++++++ common.mk | 12 ++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/windows-build.yml diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml new file mode 100644 index 0000000..9d34124 --- /dev/null +++ b/.github/workflows/windows-build.yml @@ -0,0 +1,26 @@ +name: Windows build +on: + push: + branches: [ main ] + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Fetch submodules + run: git submodule update --init --recursive + - name: Get prebuilt stuff + run: | + powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/pcsx-redux/main/mips.ps1 | iex }" + mips install 11.2.0 + C:\msys64\usr\bin\wget.exe https://github.com/Lameguy64/mkpsxiso/releases/download/v1.26/mkpsxiso-1.26.zip + C:\msys64\usr\bin\wget.exe http://psx.arthus.net/sdk/Psy-Q/psyq-4.7-converted-full.7z + 7z.exe x mkpsxiso-1.20.zip -o"$GITHUB_WORKSPACE\mkpsxiso" + 7z.exe x psyq-4.7-converted-full.7z -o"D:\a\nolibgs_hello_worlds\nolibgs_hello_worlds\psyq" + echo "$GITHUB_WORKSPACE/mkpsxiso" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo $GITHUB_PATH + - name: Make all + run: make all diff --git a/common.mk b/common.mk index 6a0b110..25ae51a 100644 --- a/common.mk +++ b/common.mk @@ -40,10 +40,18 @@ LDFLAGS += -Wl,--end-group include $(THISDIR)thirdparty/nugget/common.mk +define OBJCOPYME +$(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O $(FORMAT) -B mips $< $@ +endef + # convert TIM file to bin %.o: %.tim - $(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O $(FORMAT) -B mips $< $@ + $(call OBJCOPYME) # convert VAG files to bin %.o: %.vag - $(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O $(FORMAT) -B mips $< $@ + $(call OBJCOPYME) + +# convert HIT to bin +%.o: %.HIT + $(call OBJCOPYME) \ No newline at end of file