diff --git a/BUILDING.md b/BUILDING.md index 32e682705..6798b7362 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -186,9 +186,9 @@ cmake --build build-cmake --target ExtractAssets # Setup cmake project for building for Wii U cmake -H. -Bbuild-wiiu -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging) # Build project and generate rpx -cmake --build build-wiiu --target soh +cmake --build build-wiiu --target soh # --target soh_wuhb (for building .wuhb) -# Now you can run the executable in ./build-wiiu/soh/soh.rpx +# Now you can run the executable in ./build-wiiu/soh/soh.rpx or the Wii U Homebrew Bundle in ./build-wiiu/soh/soh.wuhb # To develop the project open the repository in VSCode (or your preferred editor) ``` diff --git a/Jenkinsfile b/Jenkinsfile index 55c4b4f28..4ca4820f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -206,9 +206,10 @@ pipeline { docker exec sohwiiucont scripts/wiiu/build.sh mv build-wiiu/soh/*.rpx soh.rpx + mv build-wiiu/soh/*.wuhb soh.wuhb mv README.md readme.txt - 7z a soh-wiiu.7z soh.rpx readme.txt + 7z a soh-wiiu.7z soh.rpx soh.wuhb readme.txt ''' } diff --git a/scripts/wiiu/build.sh b/scripts/wiiu/build.sh index c9c54e5f6..fffd767cf 100755 --- a/scripts/wiiu/build.sh +++ b/scripts/wiiu/build.sh @@ -1,4 +1,4 @@ #!/bin/bash cmake -H. -Bbuild-wiiu -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake -DCMAKE_BUILD_TYPE:STRING=Release -cmake --build build-wiiu --target soh --config Release +cmake --build build-wiiu --target soh_wuhb --config Release diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index e903ee541..819c1e5bb 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -2029,6 +2029,13 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "CafeOS") wut_create_rpx(${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/soh.rpx DESTINATION . COMPONENT ship) +wut_create_wuhb(${PROJECT_NAME} + NAME "Ship of Harkinian" + SHORTNAME "SoH" + AUTHOR "Harbour Masters" + ICON ${CMAKE_CURRENT_SOURCE_DIR}/icon.jpg +) + +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/soh.rpx ${CMAKE_CURRENT_BINARY_DIR}/soh.wuhb DESTINATION . COMPONENT ship) endif()