Skip to content

Merge in 0.3.5-dev changes #23

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 2 commits into from
Jan 26, 2026
Merged

Merge in 0.3.5-dev changes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed5170f
Add support for upcoming wut version
Maschell Jan 20, 2026
0e1b745
Update Dockerfiles
Maschell Jan 26, 2026
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/wiiu-env/devkitppc:20230621
FROM ghcr.io/wiiu-env/devkitppc:20260126

WORKDIR build
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.buildexamples
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/wiiu-env/devkitppc:20230621
FROM ghcr.io/wiiu-env/devkitppc:20260126

WORKDIR build
COPY . .
Expand All @@ -8,7 +8,7 @@ WORKDIR /artifacts
FROM scratch as libwums
COPY --from=0 /artifacts /artifacts

FROM ghcr.io/wiiu-env/devkitppc:20230621
FROM ghcr.io/wiiu-env/devkitppc:20260126

COPY --from=libwums /artifacts $DEVKITPRO

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.buildlocal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ghcr.io/wiiu-env/devkitppc:20230621
FROM ghcr.io/wiiu-env/devkitppc:20260126

WORKDIR project
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include $(TOPDIR)/share/wums_rules

export WUMS_MAJOR := 0
export WUMS_MINOR := 3
export WUMS_PATCH := 2
export WUMS_PATCH := 5

VERSION := $(WUMS_MAJOR).$(WUMS_MINOR).$(WUMS_PATCH)

Expand Down
23 changes: 10 additions & 13 deletions include/wums/hooks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ typedef enum wums_hook_type_t {
WUMS_HOOK_ALL_APPLICATION_ENDS_DONE,
WUMS_HOOK_ALL_APPLICATION_REQUESTS_EXIT_DONE,
// Introduced in 0.3.4
WUMS_HOOK_GET_CUSTOM_RPL_ALLOCATOR, // for internal usage only
WUMS_HOOK_CLEAR_ALLOCATED_RPL_MEMORY // for internal usage only
WUMS_HOOK_GET_CUSTOM_RPL_ALLOCATOR, // for internal usage only
WUMS_HOOK_CLEAR_ALLOCATED_RPL_MEMORY, // for internal usage only
// Introduced in 0.3.5
WUMS_HOOK_INIT_WUT_THREAD // for internal usage only
} wums_hook_type_t;

typedef uint32_t (*WUMSRPLAllocatorAllocFn)(int32_t size, int32_t align, void **outAddr);
Expand Down Expand Up @@ -187,17 +189,12 @@ typedef struct wums_relocs_done_args_t {
} \
WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_NEWLIB, on_fini_wut_newlib)

#define WUMS_USE_WUT_STDCPP() \
__EXTERN_C_MACRO void __init_wut_stdcpp(); \
void on_init_wut_stdcpp() { \
__init_wut_stdcpp(); \
} \
WUMS_HOOK_EX(WUMS_HOOK_INIT_WUT_STDCPP, on_init_wut_stdcpp); \
__EXTERN_C_MACRO void __fini_wut_stdcpp(); \
void on_fini_wut_stdcpp() { \
__fini_wut_stdcpp(); \
} \
WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_STDCPP, on_fini_wut_stdcpp)
#define WUMS_USE_WUT_THREAD() \
__EXTERN_C_MACRO void __init_wut_thread(); \
void on_init_wut_thread() { \
__init_wut_thread(); \
} \
WUMS_HOOK_EX(WUMS_HOOK_INIT_WUT_THREAD, on_init_wut_thread);

#define WUMS_USE_WUT_SOCKETS() \
__EXTERN_C_MACRO void __init_wut_socket(); \
Expand Down
4 changes: 2 additions & 2 deletions include/wums/meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
extern "C" {
#endif

#define WUMS_VERSION "0.3.4"
#define WUMS_VERSION "0.3.5"

#define WUMS_MODULE_EXPORT_NAME(__module_name) \
WUMS_META(export_name, __module_name); \
WUMS_META(wums, WUMS_VERSION); \
WUMS_USE_WUT_MALLOC(); \
WUMS_USE_WUT_SOCKETS(); \
WUMS_USE_WUT_NEWLIB(); \
WUMS_USE_WUT_STDCPP(); \
WUMS_USE_WUT_THREAD(); \
WUMS___INIT_WRAPPER(); \
WUMS___FINI_WRAPPER(); \
WUMS_META(buildtimestamp, __DATE__ " " __TIME__); \
Expand Down
Loading