Skip to content

Commit

Permalink
wiiu: Add workflow and update libultraship
Browse files Browse the repository at this point in the history
  • Loading branch information
GaryOderNichts committed Jun 19, 2024
1 parent d2cdb11 commit 230d3a6
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 2 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,63 @@ jobs:
2ship.appimage
readme.txt
build-wiiu:
needs: generate-2ship-otr
runs-on: ubuntu-22.04
container:
image: devkitpro/devkitppc:20240609
steps:
- name: Install dependencies
run: |
sudo apt-get install -y ninja-build
sudo apt-get remove -y cmake
wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
mkdir wut
cd wut
git init .
git remote add origin https://github.com/devkitPro/wut.git
git fetch --depth 1 origin f17054e3e86222c14a1094639558d34b690636ed
git checkout FETCH_HEAD
make -j$(nproc)
make install
cd ..
- uses: actions/checkout@v4
with:
submodules: true
- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.13
with:
key: wiiu-ccache-${{ github.ref }}-${{ github.sha }}
restore-keys: |
wiiu-ccache-${{ github.ref }}
wiiu-ccache-
- name: Build 2Ship
run: |
cmake -H. -Bbuild-wiiu -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
cmake --build build-wiiu --target 2ship_wuhb --config Release -j3
mv build-wiiu/mm/*.rpx 2ship.rpx
mv build-wiiu/mm/*.wuhb 2ship.wuhb
mv README.md readme.txt
env:
DEVKITPRO: /opt/devkitpro
DEVKITPPC: /opt/devkitpro/devkitPPC
- name: Download 2ship.o2r
uses: actions/download-artifact@v4
with:
name: 2ship.o2r
- name: Upload build
uses: actions/upload-artifact@v4
with:
name: 2ship-wiiu
path: |
2ship.rpx
2ship.wuhb
2ship.o2r
readme.txt
build-windows:
needs: generate-2ship-otr
runs-on: windows-latest
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "libultraship"]
path = libultraship
url = https://github.com/kenix3/libultraship.git
url = https://github.com/HarbourMasters/libultraship-wiiu.git
[submodule "OTRExporter"]
path = OTRExporter
url = https://github.com/louist103/OTRExporter.git
Expand Down
2 changes: 1 addition & 1 deletion libultraship
Submodule libultraship updated 98 files
+6 −1 .gitignore
+4 −0 CMakeLists.txt
+22 −12 cmake/dependencies/common.cmake
+47 −0 cmake/dependencies/patches/spdlog-wiiu.patch
+156 −0 cmake/dependencies/patches/threadpool-wiiu.patch
+48 −0 cmake/dependencies/wiiu.cmake
+3 −0 include/libultraship/classes.h
+5 −0 include/libultraship/libultra/time.h
+39 −3 src/CMakeLists.txt
+13 −1 src/Context.cpp
+3 −0 src/config/Config.cpp
+6 −0 src/controller/controldeck/ControlDeck.cpp
+2 −0 src/controller/controldeck/ControlDeck.h
+2 −0 src/controller/controldevice/controller/Controller.cpp
+2 −0 src/controller/controldevice/controller/Controller.h
+34 −0 src/controller/controldevice/controller/ControllerButton.cpp
+2 −0 src/controller/controldevice/controller/ControllerButton.h
+20 −0 src/controller/controldevice/controller/ControllerGyro.cpp
+18 −0 src/controller/controldevice/controller/ControllerLED.cpp
+33 −0 src/controller/controldevice/controller/ControllerRumble.cpp
+40 −0 src/controller/controldevice/controller/ControllerStick.cpp
+2 −0 src/controller/controldevice/controller/ControllerStick.h
+2 −2 src/controller/controldevice/controller/mapping/ControllerRumbleMapping.h
+291 −0 src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.cpp
+8 −0 src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.h
+408 −0 src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.cpp
+7 −0 src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.h
+57 −1 src/controller/controldevice/controller/mapping/factories/GyroMappingFactory.cpp
+4 −0 src/controller/controldevice/controller/mapping/factories/GyroMappingFactory.h
+6 −0 src/controller/controldevice/controller/mapping/factories/LEDMappingFactory.cpp
+2 −0 src/controller/controldevice/controller/mapping/factories/LEDMappingFactory.h
+138 −0 src/controller/controldevice/controller/mapping/factories/RumbleMappingFactory.cpp
+6 −0 src/controller/controldevice/controller/mapping/factories/RumbleMappingFactory.h
+185 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUAxisDirectionToAxisDirectionMapping.cpp
+31 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUAxisDirectionToAxisDirectionMapping.h
+300 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToAnyMapping.cpp
+31 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToAnyMapping.h
+63 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToAxisDirectionMapping.cpp
+19 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToAxisDirectionMapping.h
+64 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToButtonMapping.cpp
+17 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUButtonToButtonMapping.h
+97 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUGyroMapping.cpp
+25 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUGyroMapping.h
+113 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUMapping.cpp
+30 −0 src/controller/controldevice/controller/mapping/wiiu/WiiUMapping.h
+102 −0 src/controller/controldevice/controller/mapping/wiiu/WiiURumbleMapping.cpp
+28 −0 src/controller/controldevice/controller/mapping/wiiu/WiiURumbleMapping.h
+87 −0 src/controller/deviceindex/ControllerDisconnectedWindow.cpp
+5 −0 src/controller/deviceindex/ControllerDisconnectedWindow.h
+125 −0 src/controller/deviceindex/ControllerReorderingWindow.cpp
+5 −0 src/controller/deviceindex/ControllerReorderingWindow.h
+199 −0 src/controller/deviceindex/ShipDeviceIndexMappingManager.cpp
+17 −0 src/controller/deviceindex/ShipDeviceIndexMappingManager.h
+102 −0 src/controller/deviceindex/ShipDeviceIndexToWiiUDeviceIndexMapping.cpp
+38 −0 src/controller/deviceindex/ShipDeviceIndexToWiiUDeviceIndexMapping.h
+22 −0 src/graphic/Fast3D/Fast3dWindow.cpp
+0 −6 src/graphic/Fast3D/gfx_cc.cpp
+27 −47 src/graphic/Fast3D/gfx_direct3d_common.cpp
+931 −0 src/graphic/Fast3D/gfx_gx2.cpp
+16 −0 src/graphic/Fast3D/gfx_gx2.h
+27 −47 src/graphic/Fast3D/gfx_metal_shader.cpp
+27 −47 src/graphic/Fast3D/gfx_opengl.cpp
+26 −24 src/graphic/Fast3D/gfx_pc.cpp
+492 −0 src/graphic/Fast3D/gfx_wiiu.cpp
+38 −0 src/graphic/Fast3D/gfx_wiiu.h
+983 −0 src/graphic/Fast3D/gx2_shader_gen.c
+31 −0 src/graphic/Fast3D/gx2_shader_gen.h
+650 −0 src/graphic/Fast3D/gx2_shader_inl.h
+11 −0 src/graphic/Fast3D/gx2_shaders/build_shaders.sh
+123 −0 src/graphic/Fast3D/gx2_shaders/conv.inc
+15 −0 src/graphic/Fast3D/gx2_shaders/conv.psh
+19 −0 src/graphic/Fast3D/gx2_shaders/conv.vsh
+148 −0 src/graphic/Fast3D/gx2_util.cpp
+14 −0 src/graphic/Fast3D/gx2_util.h
+344 −0 src/port/wiiu/ImGui/imgui_impl_gx2.cpp
+28 −0 src/port/wiiu/ImGui/imgui_impl_gx2.h
+328 −0 src/port/wiiu/ImGui/imgui_impl_wiiu.cpp
+32 −0 src/port/wiiu/ImGui/imgui_impl_wiiu.h
+8 −0 src/port/wiiu/ImGui/shaders/build-shaders.sh
+148 −0 src/port/wiiu/ImGui/shaders/shader.h
+25 −0 src/port/wiiu/ImGui/shaders/shader.psh
+47 −0 src/port/wiiu/ImGui/shaders/shader.vsh
+225 −0 src/port/wiiu/WiiUImpl.cpp
+27 −0 src/port/wiiu/WiiUImpl.h
+2 −0 src/public/libultra/os.cpp
+4 −1 src/resource/ResourceManager.cpp
+1 −0 src/resource/ResourceType.h
+64 −0 src/resource/factory/ArrayFactory.cpp
+11 −0 src/resource/factory/ArrayFactory.h
+45 −0 src/resource/type/Array.cpp
+85 −0 src/resource/type/Array.h
+2 −0 src/window/Window.cpp
+1 −1 src/window/Window.h
+8 −1 src/window/gui/ConsoleWindow.cpp
+1 −1 src/window/gui/GameOverlay.cpp
+65 −0 src/window/gui/Gui.cpp
+130 −0 src/window/gui/InputEditorWindow.cpp
+2 −0 src/window/gui/StatsWindow.cpp

0 comments on commit 230d3a6

Please sign in to comment.