mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build for wii u (#2946) 

* reimplement stuff from 2879

* header include to fix build hopefully

* another header

* fix error

* remove header includes we don't have

* more error things

* a

* b

* c

* d

* e

* f

* g

* h

* use latest lus

---------

Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2023-06-05 14:16:56 -04:00 committed by GitHub
parent 2308ab8823
commit a49f197f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
.github/workflows/generate-builds.yml vendored
View File

@ -229,48 +229,48 @@ jobs:
soh.nro soh.nro
soh.otr soh.otr
readme.txt readme.txt
# build-wiiu: build-wiiu:
# needs: generate-soh-otr needs: generate-soh-otr
# runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }} runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }}
# container: container:
# image: devkitpro/devkitppc:latest image: devkitpro/devkitppc:20230110
# steps: steps:
# - name: Install dependencies - name: Install dependencies
# if: ${{ !vars.LINUX_RUNNER }} if: ${{ !vars.LINUX_RUNNER }}
# run: | run: |
# sudo apt-get update sudo apt-get update
# sudo apt-get install -y ninja-build sudo apt-get install -y ninja-build
# - uses: actions/checkout@v3 - uses: actions/checkout@v3
# with: with:
# submodules: true submodules: true
# - name: ccache - name: ccache
# uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
# with: with:
# key: ${{ runner.os }}-wiiu-ccache key: ${{ runner.os }}-wiiu-ccache
# - name: Build SoH - name: Build SoH
# run: | 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 -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 soh_wuhb --config Release -j3 cmake --build build-wiiu --target soh_wuhb --config Release -j3
# mv build-wiiu/soh/*.rpx soh.rpx mv build-wiiu/soh/*.rpx soh.rpx
# mv build-wiiu/soh/*.wuhb soh.wuhb mv build-wiiu/soh/*.wuhb soh.wuhb
# mv README.md readme.txt mv README.md readme.txt
# env: env:
# DEVKITPRO: /opt/devkitpro DEVKITPRO: /opt/devkitpro
# DEVKITPPC: /opt/devkitpro/devkitPPC DEVKITPPC: /opt/devkitpro/devkitPPC
# - name: Download soh.otr - name: Download soh.otr
# uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
# with: with:
# name: soh.otr name: soh.otr
# - name: Upload build - name: Upload build
# uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
# with: with:
# name: soh-wiiu name: soh-wiiu
# path: | path: |
# soh.rpx soh.rpx
# soh.wuhb soh.wuhb
# soh.otr soh.otr
# readme.txt readme.txt
build-windows: build-windows:
needs: generate-soh-otr needs: generate-soh-otr
runs-on: ${{ (vars.WINDOWS_RUNNER && fromJSON(vars.WINDOWS_RUNNER)) || 'windows-latest' }} runs-on: ${{ (vars.WINDOWS_RUNNER && fromJSON(vars.WINDOWS_RUNNER)) || 'windows-latest' }}

2
libultraship

@ -1 +1 @@
Subproject commit 31189cc9b3891a6049478e955a47589ce964265d Subproject commit f081dace55d6f78052527495745437ee37833dbe

2
soh/soh/OTRGlobals.cpp
View File

@ -742,7 +742,7 @@ extern "C" void InitOTR() {
#ifdef __SWITCH__ #ifdef __SWITCH__
LUS::Switch::Init(LUS::PreInitPhase); LUS::Switch::Init(LUS::PreInitPhase);
#elif defined(__WIIU__) #elif defined(__WIIU__)
LUS::WiiU::Init(); LUS::WiiU::Init("soh");
#endif #endif
OTRGlobals::Instance = new OTRGlobals(); OTRGlobals::Instance = new OTRGlobals();

2
soh/soh/SohMenuBar.cpp
View File

@ -281,7 +281,9 @@ void DrawSettingsMenu() {
UIWidgets::Spacer(0); UIWidgets::Spacer(0);
ImGui::PushItemWidth(std::min((ImGui::GetContentRegionAvail().x - 60.0f), 260.0f));
ImGui::SliderInt("##WiiUFPSSlider", &fpsSlider, 1, 3, "", ImGuiSliderFlags_AlwaysClamp); ImGui::SliderInt("##WiiUFPSSlider", &fpsSlider, 1, 3, "", ImGuiSliderFlags_AlwaysClamp);
ImGui::PopItemWidth();
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f); ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);