Merged upstream

This commit is contained in:
Reonu
2021-05-13 21:26:54 +01:00
2 changed files with 6 additions and 2 deletions

View File

@@ -191,8 +191,10 @@ endif
ifeq ($(USE_DEBUG),1)
ULTRALIB := ultra_d
DEFINES += DEBUG=1
else
ULTRALIB := ultra_rom
DEFINES += _FINALROM=1 NDEBUG=1
endif
# HVQM - whether to use HVQM fmv library

View File

@@ -319,11 +319,13 @@ void thread3_main(UNUSED void *arg) {
crash_screen_init();
#endif
/*osSyncPrintf("Super Mario 64\n");
#ifdef DEBUG
osSyncPrintf("Super Mario 64\n");
osSyncPrintf("Built by: %s\n", __username__);
osSyncPrintf("Date : %s\n", __datetime__);
osSyncPrintf("Compiler: %s\n", __compiler__);
osSyncPrintf("Linker : %s\n", __linker__);*/
osSyncPrintf("Linker : %s\n", __linker__);
#endif
create_thread(&gSoundThread, 4, thread4_sound, NULL, gThread4Stack + 0x2000, 20);
osStartThread(&gSoundThread);