Merge branch 'main' of git.sr.ht:~rabbits/uxn

This commit is contained in:
neauoire 2022-01-07 16:47:01 -08:00
commit 8fdb039926
12 changed files with 16 additions and 13 deletions

2
.gitignore vendored
View File

@ -13,3 +13,5 @@
*theme *theme
*.rom *.rom
*.[o0125678vqki]

7
mkfile
View File

@ -8,6 +8,7 @@ HFILES=\
/sys/include/npe/stdio.h\ /sys/include/npe/stdio.h\
src/devices/audio.h\ src/devices/audio.h\
src/devices/controller.h\ src/devices/controller.h\
src/devices/datetime.h\
src/devices/file.h\ src/devices/file.h\
src/devices/mouse.h\ src/devices/mouse.h\
src/devices/screen.h\ src/devices/screen.h\
@ -32,19 +33,19 @@ bin:
%.rom:Q: %.tal bin/uxnasm %.rom:Q: %.tal bin/uxnasm
bin/uxnasm $stem.tal $target >/dev/null bin/uxnasm $stem.tal $target >/dev/null
bin/uxncli: file.$O system.$O uxncli.$O uxn.$O bin/uxncli: file.$O datetime.$O system.$O uxncli.$O uxn.$O
$LD $LDFLAGS -o $target $prereq $LD $LDFLAGS -o $target $prereq
bin/uxnasm: uxnasm.$O bin/uxnasm: uxnasm.$O
$LD $LDFLAGS -o $target $prereq $LD $LDFLAGS -o $target $prereq
bin/uxnemu: audio.$O controller.$O file.$O mouse.$O screen.$O system.$O uxn.$O uxnemu.$O bin/uxnemu: audio.$O controller.$O datetime.$O file.$O mouse.$O screen.$O system.$O uxn.$O uxnemu.$O
$LD $LDFLAGS -o $target $prereq $LD $LDFLAGS -o $target $prereq
(uxnasm|uxncli|uxnemu|uxn)\.$O:R: src/\1.c (uxnasm|uxncli|uxnemu|uxn)\.$O:R: src/\1.c
$CC $CFLAGS -Isrc -o $target src/$stem1.c $CC $CFLAGS -Isrc -o $target src/$stem1.c
(audio|controller|file|mouse|screen|system)\.$O:R: src/devices/\1.c (audio|controller|datetime|file|mouse|screen|system)\.$O:R: src/devices/\1.c
$CC $CFLAGS -Isrc -o $target src/devices/$stem1.c $CC $CFLAGS -Isrc -o $target src/devices/$stem1.c
nuke:V: clean nuke:V: clean

View File

@ -28,4 +28,4 @@ extern UxnAudio uxn_audio[POLYPHONY];
Uint8 audio_get_vu(UxnAudio *c); Uint8 audio_get_vu(UxnAudio *c);
int audio_render(UxnAudio *c, Sint16 *sample, Sint16 *end); int audio_render(UxnAudio *c, Sint16 *sample, Sint16 *end);
void audio_start(UxnAudio *c, Uint16 adsr, Uint8 pitch); void audio_start(UxnAudio *c, Uint16 adsr, Uint8 pitch);
void audio_finished_handler(UxnAudio *c); void audio_finished_handler(UxnAudio *c);

View File

@ -49,4 +49,4 @@ controller_special(Device *d, Uint8 key)
uxn_eval(d->u, GETVECTOR(d)); uxn_eval(d->u, GETVECTOR(d));
d->dat[4] = 0x00; d->dat[4] = 0x00;
} }
} }

View File

@ -13,4 +13,4 @@ WITH REGARD TO THIS SOFTWARE.
void controller_down(Device *d, Uint8 mask); void controller_down(Device *d, Uint8 mask);
void controller_up(Device *d, Uint8 mask); void controller_up(Device *d, Uint8 mask);
void controller_key(Device *d, Uint8 key); void controller_key(Device *d, Uint8 key);
void controller_special(Device *d, Uint8 key); void controller_special(Device *d, Uint8 key);

View File

@ -37,4 +37,4 @@ datetime_dei(Device *d, Uint8 port)
case 0xa: return t->tm_isdst; case 0xa: return t->tm_isdst;
default: return d->dat[port]; default: return d->dat[port];
} }
} }

View File

@ -10,4 +10,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
Uint8 datetime_dei(Device *d, Uint8 port); Uint8 datetime_dei(Device *d, Uint8 port);

View File

@ -174,4 +174,4 @@ file_deo(Device *d, Uint8 port)
DEVPOKE16(0x2, res); DEVPOKE16(0x2, res);
break; break;
} }
} }

View File

@ -10,4 +10,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
void file_deo(Device *d, Uint8 port); void file_deo(Device *d, Uint8 port);

View File

@ -159,4 +159,4 @@ screen_deo(Device *d, Uint8 port)
break; break;
} }
} }
} }

View File

@ -36,4 +36,4 @@ void screen_clear(UxnScreen *p, Layer *layer);
void screen_redraw(UxnScreen *p, Uint32 *pixels); void screen_redraw(UxnScreen *p, Uint32 *pixels);
Uint8 screen_dei(Device *d, Uint8 port); Uint8 screen_dei(Device *d, Uint8 port);
void screen_deo(Device *d, Uint8 port); void screen_deo(Device *d, Uint8 port);

View File

@ -13,4 +13,4 @@ Uint8 system_dei(Device *d, Uint8 port);
void system_deo(Device *d, Uint8 port); void system_deo(Device *d, Uint8 port);
void system_deo_special(Device *d, Uint8 port); void system_deo_special(Device *d, Uint8 port);
extern Uxn supervisor; extern Uxn supervisor;