Skip to content

Commit 906511d

Browse files
TurtlePTurtleP
committed
fix wiiu building, update CI
1 parent aa884cc commit 906511d

4 files changed

Lines changed: 32 additions & 50 deletions

File tree

‎.github/workflows/Nintendo 3DS.yml‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
16-
17-
- name: Configure
18-
run: /opt/devkitpro/portlibs/3ds/bin/arm-none-eabi-cmake -S . -B build
15+
uses: actions/checkout@v4
1916

2017
- name: Build
21-
run: make -C build
18+
run: catnip -T 3DS -DLIBRARY_LOADER='linktime' -DUSE_CURL_BACKEND=ON
2219

2320
- id: commit
24-
uses: pr-mpt/actions-commit-hash@v1
21+
uses: prompt/actions-commit-hash@v3
2522

2623
- uses: actions/upload-artifact@v4
2724
with:
2825
name: Nintendo 3DS-${{ steps.commit.outputs.short }}
2926
path: |
30-
build/*.elf
31-
build/*.3dsx
27+
build/**/*.elf
28+
build/**/*.3dsx
3229
3330
N3DS-Debug:
3431
runs-on: ubuntu-latest
@@ -39,20 +36,17 @@ jobs:
3936

4037
steps:
4138
- name: Checkout
42-
uses: actions/checkout@v3
43-
44-
- name: Configure
45-
run: /opt/devkitpro/portlibs/3ds/bin/arm-none-eabi-cmake -DCMAKE_BUILD_TYPE=Debug -S . -B build
39+
uses: actions/checkout@v4
4640

4741
- name: Build
48-
run: make -C build
42+
run: catnip -T 3DS debug -DLIBRARY_LOADER='linktime' -DUSE_CURL_BACKEND=ON
4943

5044
- id: commit
51-
uses: pr-mpt/actions-commit-hash@v1
45+
uses: prompt/actions-commit-hash@v3
5246

5347
- uses: actions/upload-artifact@v4
5448
with:
5549
name: Nintendo 3DS (Debug)-${{ steps.commit.outputs.short }}
5650
path: |
57-
build/*.elf
58-
build/*.3dsx
51+
build/**/*.elf
52+
build/**/*.3dsx

‎.github/workflows/Nintendo Switch.yml‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
16-
17-
- name: Configure
18-
run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S . -B build
15+
uses: actions/checkout@v4
1916

2017
- name: Build
21-
run: make -C build
18+
run: catnip -T Switch -DLIBRARY_LOADER='linktime' -DUSE_CURL_BACKEND=ON
2219

2320
- id: commit
24-
uses: pr-mpt/actions-commit-hash@v1
21+
uses: prompt/actions-commit-hash@v3
2522

2623
- uses: actions/upload-artifact@v4
2724
with:
2825
name: Nintendo Switch-${{ steps.commit.outputs.short }}
2926
path: |
30-
build/*.elf
31-
build/*.nro
27+
build/**/*.elf
28+
build/**/*.nro
3229
3330
Switch-Debug:
3431
runs-on: ubuntu-latest
@@ -39,20 +36,17 @@ jobs:
3936

4037
steps:
4138
- name: Checkout
42-
uses: actions/checkout@v3
43-
44-
- name: Configure
45-
run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -DCMAKE_BUILD_TYPE=Debug -S . -B build
39+
uses: actions/checkout@v4
4640

4741
- name: Build
48-
run: make -C build
42+
run: catnip -T Switch debug -DLIBRARY_LOADER='linktime' -DUSE_CURL_BACKEND=ON
4943

5044
- id: commit
51-
uses: pr-mpt/actions-commit-hash@v1
45+
uses: prompt/actions-commit-hash@v3
5246

5347
- uses: actions/upload-artifact@v4
5448
with:
5549
name: Nintendo Switch (Debug)-${{ steps.commit.outputs.short }}
5650
path: |
57-
build/*.elf
58-
build/*.nro
51+
build/**/*.elf
52+
build/**/*.nro

‎.github/workflows/Nintendo Wii U.yml‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
16-
17-
- name: Configure
18-
run: /opt/devkitpro/portlibs/wiiu/bin/powerpc-eabi-cmake -S . -B build
15+
uses: actions/checkout@v4
1916

2017
- name: Build
21-
run: make -C build
18+
run: catnip -T WiiU -DLIBRARY_LOADER='linktime' -DUSE_CURL_BACKEND=ON
2219

2320
- id: commit
24-
uses: pr-mpt/actions-commit-hash@v1
21+
uses: prompt/actions-commit-hash@v3
2522

2623
- uses: actions/upload-artifact@v4
2724
with:
2825
name: Nintendo Wii U-${{ steps.commit.outputs.short }}
2926
path: |
30-
build/*.elf
31-
build/*.wuhb
27+
build/**/*.elf
28+
build/**/*.wuhb
3229
3330
WiiU-Debug:
3431
runs-on: ubuntu-latest
@@ -39,20 +36,17 @@ jobs:
3936

4037
steps:
4138
- name: Checkout
42-
uses: actions/checkout@v3
43-
44-
- name: Configure
45-
run: /opt/devkitpro/portlibs/wiiu/bin/powerpc-eabi-cmake -DCMAKE_BUILD_TYPE=Debug -S . -B build
39+
uses: actions/checkout@v4
4640

4741
- name: Build
48-
run: make -C build
42+
run: catnip -T WiiU debug -DLIBRARY_LOADER='linktime' -DUSE_CURL_BACKEND=ON
4943

5044
- id: commit
51-
uses: pr-mpt/actions-commit-hash@v1
45+
uses: prompt/actions-commit-hash@v3
5246

5347
- uses: actions/upload-artifact@v4
5448
with:
5549
name: Nintendo Wii U (Debug)-${{ steps.commit.outputs.short }}
5650
path: |
57-
build/*.elf
58-
build/*.wuhb
51+
build/**/*.elf
52+
build/**/*.wuhb

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ if (NINTENDO_WIIU)
179179
execute_process(COMMAND patch -d ${CMAKE_CURRENT_BINARY_DIR}/luasocket/libluasocket -N -i ${PROJECT_SOURCE_DIR}/platform/cafe/libraries/luasocket.patch)
180180

181181
find_package(Freetype REQUIRED)
182-
set(APP_LIBS freetype bz2)
182+
set(APP_LIBS freetype brotlidec brotlicommon bz2)
183183

184184
find_package(SDL2 REQUIRED)
185185
target_include_directories(${PROJECT_NAME} PRIVATE ${DEVKITPRO}/portlibs/wiiu/include)
186186
target_include_directories(${PROJECT_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
187187

188-
target_link_libraries(${PROJECT_NAME} PRIVATE brotlidec brotlicommon bz2 SDL2_mixer mpg123 SDL2)
188+
target_link_libraries(${PROJECT_NAME} PRIVATE SDL2_mixer mpg123 SDL2)
189189
endif()
190190

191191
# Options for code generation

0 commit comments

Comments
 (0)