From fbdac77bb2f83f3d92d1434d1e58dc8d99c806f8 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 16 Sep 2023 22:50:22 +1000 Subject: [PATCH] Add Vita and PS3 instructions to readme, add actions workflows for Xbox and Vita --- .github/workflows/build_vita.yml | 31 ++++++++++++++++++++++++++ .github/workflows/build_xbox.yml | 38 ++++++++++++++++++++++++++++++++ readme.md | 31 +++++++++++++++++++------- src/Makefile_xbox | 9 +++++--- 4 files changed, 98 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/build_vita.yml create mode 100644 .github/workflows/build_xbox.yml diff --git a/.github/workflows/build_vita.yml b/.github/workflows/build_vita.yml new file mode 100644 index 000000000..a3bdbdaa7 --- /dev/null +++ b/.github/workflows/build_vita.yml @@ -0,0 +1,31 @@ +name: Build latest (Vita) +on: [push] + +concurrency: + group: ${{ github.ref }}-vita + cancel-in-progress: true + +jobs: + build-Vita: + if: github.ref_name == github.event.repository.default_branch + runs-on: ubuntu-latest + container: + image: gnuton/vitasdk-docker:latest + steps: + - uses: actions/checkout@v3 + - name: Compile Vita build + id: compile + run: | + make vita + + - uses: ./.github/actions/notify_failure + if: ${{ always() && steps.compile.outcome == 'failure' }} + with: + NOTIFY_MESSAGE: 'Failed to compile Vita build' + WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}' + + - uses: ./.github/actions/upload_build + if: ${{ always() && steps.compile.outcome == 'success' }} + with: + SOURCE_FILE: 'ClassiCube-vita.vpk' + DEST_NAME: 'ClassiCube-vita.vp' \ No newline at end of file diff --git a/.github/workflows/build_xbox.yml b/.github/workflows/build_xbox.yml new file mode 100644 index 000000000..9c6183464 --- /dev/null +++ b/.github/workflows/build_xbox.yml @@ -0,0 +1,38 @@ +name: Build latest (Xbox) +on: [push] + +concurrency: + group: ${{ github.ref }}-xbox + cancel-in-progress: true + +jobs: + build-Xbox: + if: github.ref_name == github.event.repository.default_branch + runs-on: ubuntu-latest + container: + image: ghcr.io/xboxdev/nxdk:git-e955705a + steps: + - uses: actions/checkout@v3 + - name: Compile Xbox build + id: compile + run: | + eval $(/usr/src/nxdk/bin/activate -s) + make xbox + + - uses: ./.github/actions/notify_failure + if: ${{ always() && steps.compile.outcome == 'failure' }} + with: + NOTIFY_MESSAGE: 'Failed to compile Xbox build' + WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}' + + - uses: ./.github/actions/upload_build + if: ${{ always() && steps.compile.outcome == 'success' }} + with: + SOURCE_FILE: 'ClassiCube.xbe' + DEST_NAME: 'ClassiCube-xbox.xbe' + + - uses: ./.github/actions/upload_build + if: ${{ always() && steps.compile.outcome == 'success' }} + with: + SOURCE_FILE: 'ClassiCube-xbox.iso' + DEST_NAME: 'ClassiCube-xbox.iso' \ No newline at end of file diff --git a/readme.md b/readme.md index 8cd789711..8994d7884 100644 --- a/readme.md +++ b/readme.md @@ -232,14 +232,6 @@ Install SDL2 port if needed The generated javascript file has some issues. [See here for how to fix](doc/compile-fixes.md#webclient-patches) -#### PSP - -Run `make psp`. You'll need [pspsdk](https://github.com/pspdev/pspsdk) - -**NOTE: It is recommended that you install the precompiled pspsdk version from [here](https://github.com/pspdev/pspdev/releases)** - -The PSP port needs assistance from someone experienced with PSP homebrew development - if you're interested, please get in contact with me. (`unknownshadow200` on Discord) - #### 3DS Run `make 3ds`. You'll need [libctru](https://github.com/devkitPro/libctru) @@ -264,6 +256,26 @@ Run `make gamecube`. You'll need [libogc](https://github.com/devkitPro/libogc) The GC port needs assistance from someone experienced with GameCube homebrew development - if you're interested, please get in contact with me. (`unknownshadow200` on Discord) +#### PlayStation Portable + +Run `make psp`. You'll need [pspsdk](https://github.com/pspdev/pspsdk) + +**NOTE: It is recommended that you install the precompiled pspsdk version from [here](https://github.com/pspdev/pspdev/releases)** + +The PSP port needs assistance from someone experienced with PSP homebrew development - if you're interested, please get in contact with me. (`unknownshadow200` on Discord) + +#### PlayStation Vita + +Run `make vita`. You'll need [vitasdk](https://vitasdk.org/) + +The Vita port needs assistance from someone experienced with Vita homebrew development - if you're interested, please get in contact with me. (`unknownshadow200` on Discord) + +#### PlayStation 3 + +Run `make ps3`. You'll need [PSL1GHT](https://github.com/ps3dev/PSL1GHT) + +The PS3 port needs assistance from someone experienced with PS3 homebrew development - if you're interested, please get in contact with me. (`unknownshadow200` on Discord) + #### Xbox Run `make xbox`. You'll need [nxdk](https://github.com/XboxDev/nxdk) @@ -310,6 +322,7 @@ Further information (e.g. style) for ClassiCube's source code can be found in th * [Clang](https://clang.llvm.org/) - Compiles client for macOS * [Emscripten](https://emscripten.org/) - Compiles client for web * [RenderDoc](https://renderdoc.org/) - Graphics debugging +* [BearSSL](https://www.bearssl.org/) - SSL/TLS support on consoles * [libctru](https://github.com/devkitPro/libctru) - Backend for 3DS * [citro3D](https://github.com/devkitPro/citro3d) - Rendering backend for 3DS * [Citra](https://github.com/citra-emu/citra) - Emulator used to test 3DS port @@ -317,6 +330,8 @@ Further information (e.g. style) for ClassiCube's source code can be found in th * [PPSSPP](https://github.com/hrydgard/ppsspp) - Emulator used to test PSP port * [vitasdk](https://github.com/vitasdk) - Backend for PS Vita * [Vita3K](https://github.com/Vita3K/Vita3K) - Emulator used to test Vita port +* [PSL1GHT](https://github.com/ps3dev/PSL1GHT) - Backend for PS3 +* [RPCS3](https://github.com/RPCS3/rpcs3) - Emulator used to test PS3 port * [libogc](https://github.com/devkitPro/libogc) - Backend for Wii and GameCube * [libfat](https://github.com/devkitPro/libfat) - Filesystem backend for Wii/GC * [Dolphin](https://github.com/dolphin-emu/dolphin) - Emulator used to test Wii/GC port diff --git a/src/Makefile_xbox b/src/Makefile_xbox index fd2630662..2c650c738 100644 --- a/src/Makefile_xbox +++ b/src/Makefile_xbox @@ -1,9 +1,12 @@ +ifeq ($(strip $(NXDK_DIR)),) +$(error "Please set NXDK_DIR in your environment") +endif + XBE_TITLE = ClassiCube -GEN_XISO = $(XBE_TITLE).iso +GEN_XISO = ClassiCube-xbox.iso SRCS = $(wildcard src/*.c) -NXDK_DIR = /home/test/Downloads/nxdk SHADER_OBJS = misc/xbox/vs_coloured.inl misc/xbox/vs_textured.inl misc/xbox/ps_coloured.inl misc/xbox/ps_textured.inl NXDK_NET = y NXDK_LDFLAGS = -stack:131072 -include $(NXDK_DIR)/Makefile +include $(NXDK_DIR)/Makefile \ No newline at end of file