Skip to content

Use latest WUPS and libbuttoncombo version #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maschell merged 1 commit into from
Jan 25, 2025
Merged

Use latest WUPS and libbuttoncombo version #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ghcr.io/wiiu-env/devkitppc:20241128

COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20250105-94ce09a /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20250125-f8faa9f /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250104-0663ede /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250125-cb22627 /artifacts $DEVKITPRO

WORKDIR project
22 changes: 11 additions & 11 deletions source/plugin/ButtonComboManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,30 +245,30 @@ namespace {
ButtonComboModule_ComboType convertType(const WUPSButtonCombo_ComboType other) {
switch (other) {
case WUPS_BUTTON_COMBO_COMBO_TYPE_INVALID:
return BUTTON_COMBO_MODULE_TYPE_INVALID;
return BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID;
case WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD:
return BUTTON_COMBO_MODULE_TYPE_HOLD;
return BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD;
case WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN:
return BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN;
return BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN;
case WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD_OBSERVER:
return BUTTON_COMBO_MODULE_TYPE_HOLD_OBSERVER;
return BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER;
case WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN_OBSERVER:
return BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN_OBSERVER;
return BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER;
}
return BUTTON_COMBO_MODULE_TYPE_INVALID;
return BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID;
}

WUPSButtonCombo_ComboType convertType(const ButtonComboModule_ComboType other) {
switch (other) {
case BUTTON_COMBO_MODULE_TYPE_INVALID:
case BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID:
return WUPS_BUTTON_COMBO_COMBO_TYPE_INVALID;
case BUTTON_COMBO_MODULE_TYPE_HOLD:
case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD:
return WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD;
case BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN:
case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN:
return WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN;
case BUTTON_COMBO_MODULE_TYPE_HOLD_OBSERVER:
case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER:
return WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD_OBSERVER;
case BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN_OBSERVER:
case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER:
return WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN_OBSERVER;
}
return WUPS_BUTTON_COMBO_COMBO_TYPE_INVALID;
Expand Down