-
-
Notifications
You must be signed in to change notification settings - Fork 116
Expand file tree
/
Copy pathlibgxflux-changes.patch
More file actions
179 lines (159 loc) · 4.25 KB
/
libgxflux-changes.patch
File metadata and controls
179 lines (159 loc) · 4.25 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
diff -r 651485e1d462 common.mk
--- a/common.mk Sun Sep 29 18:42:52 2019 +0200
+++ b/common.mk Mon Feb 02 19:05:34 2026 -0300
@@ -31,6 +31,8 @@
DEPDIR = .deps
+.PHONY: all
+
all: $(TARGET)
ifeq ($(LIBRARY),1)
@@ -60,13 +62,15 @@
@echo " STRIP $@"
@$(STRIP) $< -o $@
+.PHONY: wiiload geckoload upload
+
wiiload: $(TARGET_STRIPPED)
@echo " WIILOAD $<"
- @$(DEVKITPPC)/bin/wiiload $<
+ @$(DEVKITPRO)/tools/bin/wiiload $<
geckoload: $(TARGET_STRIPPED)
@echo " WIILOAD $<"
- @WIILOAD=$(USBGECKODEVICE) $(DEVKITPPC)/bin/wiiload $<
+ @WIILOAD=$(USBGECKODEVICE) $(DEVKITPRO)/tools/bin/wiiload $<
upload: geckoload
endif
@@ -84,10 +88,10 @@
@echo " ASSEMBLE $@"
@$(CC) $(CFLAGS) $(DEFINES) $(ASFLAGS) -c $< -o $@
+.PHONY: clean
+
clean:
@rm -rf $(DEPDIR)
@rm -f $(TARGET) $(TARGET_STRIPPED) $(TARGET).map $(OBJS)
-include $(DEPDIR)/*
-
-.PHONY: clean
diff -r 651485e1d462 examples/console/main.c
--- a/examples/console/main.c Sun Sep 29 18:42:52 2019 +0200
+++ b/examples/console/main.c Mon Feb 02 19:05:34 2026 -0300
@@ -13,7 +13,13 @@
static bool quit = false;
-void stmcb(void) {
+void on_power(void) {
+ quit = true;
+}
+
+void on_reset(u32 irq, void* ctx) {
+ (void)irq;
+ (void)ctx;
quit = true;
}
@@ -25,8 +31,8 @@
VIDEO_Init();
PAD_Init();
- SYS_SetResetCallback(stmcb);
- SYS_SetPowerCallback(stmcb);
+ SYS_SetResetCallback(on_reset);
+ SYS_SetPowerCallback(on_power);
gfx_video_init(NULL);
gfx_init();
diff -r 651485e1d462 src/Makefile
--- a/src/Makefile Sun Sep 29 18:42:52 2019 +0200
+++ b/src/Makefile Mon Feb 02 19:05:34 2026 -0300
@@ -7,18 +7,19 @@
include ../common.mk
ifeq ($(GAMECUBE),1)
-INSTALLLIB = $(DEVKITPRO)/libogc/lib/cube
+INSTALLLIB = $(DESTDIR)$(DEVKITPRO)/libogc/lib/cube
else
-INSTALLLIB = $(DEVKITPRO)/libogc/lib/wii
+INSTALLLIB = $(DESTDIR)$(DEVKITPRO)/libogc/lib/wii
endif
-INSTALLINCLUDE = $(DEVKITPRO)/libogc/include/gxflux
+INSTALLINCLUDE = $(DESTDIR)$(DEVKITPRO)/libogc/include/gxflux
+
+.PHONY: install install-all
install: all
@echo " INSTALL $(INSTALLLIB)"
- @install -m 644 $(TARGET) $(INSTALLLIB)
- @mkdir -p $(INSTALLINCLUDE)
- @install -m 644 $(HEADERS) $(INSTALLINCLUDE)
+ @install -Dm 644 -t $(INSTALLLIB) $(TARGET)
+ @install -Dm 644 -t $(INSTALLINCLUDE) $(HEADERS)
install-all:
@$(MAKE) --no-print-directory clean
diff -r 651485e1d462 src/gfx_con.c
--- a/src/gfx_con.c Sun Sep 29 18:42:52 2019 +0200
+++ b/src/gfx_con.c Mon Feb 02 19:05:34 2026 -0300
@@ -42,34 +42,38 @@
static ssize_t _con_read(struct _reent *r, void *fd, char *ptr, size_t len);
static const devoptab_t _dt_stdio = {
- "stdio", // device name
- 0, // size of file structure
- NULL, // device open
- NULL, // device close
- _con_write, // device write
- _con_read, // device read
- NULL, // device seek
- NULL, // device fstat
- NULL, // device stat
- NULL, // device link
- NULL, // device unlink
- NULL, // device chdir
- NULL, // device rename
- NULL, // device mkdir
- 0, // dirStateSize
- NULL, // device diropen_r
- NULL, // device dirreset_r
- NULL, // device dirnext_r
- NULL, // device dirclose_r
- NULL, // device statvfs_r
- NULL, // device ftrunctate_r
- NULL, // device fsync_r
- NULL, // deviceData;
- NULL, // chmod_r
- NULL, // fchmod_r
- NULL, // rmdir_r
- NULL, // lstat_r
- NULL, // utimes_r
+ .name = "stdio",
+ .structSize = sizeof(devoptab_t),
+ .open_r = NULL,
+ .close_r = NULL,
+ .write_r = _con_write,
+ .read_r = _con_read,
+ .seek_r = NULL,
+ .fstat_r = NULL,
+ .stat_r = NULL,
+ .link_r = NULL,
+ .unlink_r = NULL,
+ .chdir_r = NULL,
+ .rename_r = NULL,
+ .mkdir_r = NULL,
+ .dirStateSize = 0,
+ .diropen_r = NULL,
+ .dirreset_r = NULL,
+ .dirnext_r = NULL,
+ .dirclose_r = NULL,
+ .statvfs_r = NULL,
+ .ftruncate_r = NULL,
+ .fsync_r = NULL,
+ .deviceData = NULL,
+ .chmod_r = NULL,
+ .fchmod_r = NULL,
+ .rmdir_r = NULL,
+ .lstat_r = NULL,
+ .utimes_r = NULL,
+ .fpathconf_r = NULL,
+ .pathconf_r = NULL,
+ .symlink_r = NULL,
+ .readlink_r = NULL,
};
static const GXColor _con_colors[] = {
@@ -312,6 +316,7 @@
default:
break;
}
+ break;
case 'm': // Set Attribute Mode
if (!count)