diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f9a3707..47ccb883 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: - { name: 'iOS', os: 'macos-15', generator: 'Xcode', dx5: false, config: false, brew: true, werror: true, clang-tidy: false, cmake-args: '-DCMAKE_SYSTEM_NAME=iOS', ios: true } - { name: 'Emscripten', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, emsdk: true, werror: true, clang-tidy: false, cmake-wrapper: 'emcmake' } - { name: 'Nintendo 3DS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, n3ds: true, werror: true, clang-tidy: false, container: 'devkitpro/devkitarm:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake' } - - { name: 'Nintendo Wii U', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, wiiu: true, werror: false, clang-tidy: false, container: 'devkitpro/devkitppc:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/devkitPPC.cmake -DCMAKE_PREFIX_PATH=/opt/devkitpro/devkitPPC/powerpc-eabi/lib/libstdc++.a', sdl2: true } + - { name: 'Nintendo Wii U', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, wiiu: true, werror: false, clang-tidy: false, container: 'devkitpro/devkitppc:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake -DCMAKE_PREFIX_PATH=/opt/devkitpro/devkitPPC/powerpc-eabi/lib/libstdc++.a', sdl2: true } - { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 17 2022', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true} - { name: 'Android', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, android: true, werror: true, clang-tidy: false,} steps: @@ -228,10 +228,10 @@ jobs: if: ${{ matrix.wiiu }} run: | mkdir -p build/dist - mv build/*.elf packaging/wiiu/ - mv packaging/wiiu/ build/dist/ + mv build/*.rpx packaging/wiiu/Legacy/ + mv packaging/wiiu/Legacy/ build/dist/ cd build/dist - mv wiiu isle-U + mv Legacy isle-U - name: Package (Android) if: ${{ matrix.android }} diff --git a/CMakeLists.txt b/CMakeLists.txt index dace44bc..8c1036b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -936,11 +936,9 @@ if(WINDOWS_STORE) PATTERN "*/*.msixbundle") endif() if(WIIU) - # litte test commenting these out + wut_create_rpx(isle) - # wut_create_rpx(isle) - - # install(FILES "$/isle.rpx" DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(FILES "$/isle.rpx" DESTINATION "${CMAKE_INSTALL_BINDIR}") if(WIIU_WUHB) endif() diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 313bd11b..011b9187 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -294,6 +294,12 @@ void IsleApp::SetupVideoFlags( } } +int main(int argc, char **argv) +{ + return 0; +} + + SDL_AppResult SDL_AppInit(void** appstate, int argc, char** argv) { *appstate = NULL; diff --git a/packaging/wiiu/content/renderer.gsh b/packaging/wiiu/Legacy/content/renderer.gsh similarity index 100% rename from packaging/wiiu/content/renderer.gsh rename to packaging/wiiu/Legacy/content/renderer.gsh diff --git a/packaging/wiiu/icon.png b/packaging/wiiu/Legacy/icon.png similarity index 100% rename from packaging/wiiu/icon.png rename to packaging/wiiu/Legacy/icon.png diff --git a/packaging/wiiu/meta.xml b/packaging/wiiu/Legacy/meta.xml similarity index 100% rename from packaging/wiiu/meta.xml rename to packaging/wiiu/Legacy/meta.xml