Replace debug libultra builds with their ido counterparts (#572)

* Replace debug libultra builds with their ido counterparts

This is necessary because GameCube controllers apparently rely on the IDO build, also the release build is IDO anyway

* Remove fallthrough warnings from usb/debug.c

* remove need for debug libultra with unf and use lib define in ld

Co-authored-by: thecozies <collinpferguson@gmail.com>
This commit is contained in:
Gregory Heskett
2023-01-26 10:03:07 -05:00
committed by GitHub
parent 7fdb5af8fd
commit 52a7aedaf4
6 changed files with 20 additions and 32 deletions

30
sm64.ld
View File

@@ -168,11 +168,7 @@ SECTIONS
#ifdef S2DEX_TEXT_ENGINE
lib/libs2d_engine.a:*(.text*);
#endif
#if defined(ISVPRINT) || defined(UNF)
*/libultra_d.a:*.o(.text*);
#else
*/libultra_rom.a:*.o(.text*);
#endif
*/ULTRALIB.a:*.o(.text*);
*/libnustd.a:*.o(.text*);
*/libgcc.a:*.o(.text*);
*/librtc.a:*.o(.text*);
@@ -194,11 +190,7 @@ SECTIONS
#ifdef S2DEX_TEXT_ENGINE
lib/libs2d_engine.a:*(.*data*);
#endif
#if defined(ISVPRINT) || defined(UNF)
*/libultra_d.a:*.o(.data*);
#else
*/libultra_rom.a:*.o(.data*);
#endif
*/ULTRALIB.a:*.o(.data*);
*/libhvqm2.a:*.o(.data*);
*/librtc.a:*.o(.data*);
*/libz.a:*.o(.data*);
@@ -214,11 +206,7 @@ SECTIONS
#ifdef S2DEX_TEXT_ENGINE
lib/libs2d_engine.a:*(.rodata*);
#endif
#if defined(ISVPRINT) || defined(UNF)
*/libultra_d.a:*.o(.rodata*);
#else
*/libultra_rom.a:*.o(.rodata*);
#endif
*/ULTRALIB.a:*.o(.rodata*);
*/libgcc.a:*.o(.rodata*);
*/librtc.a:*.o(.rodata*);
*/libz.a:*.o(.rodata*);
@@ -235,15 +223,9 @@ SECTIONS
#ifdef S2DEX_TEXT_ENGINE
lib/libs2d_engine.a:*(.*bss*);
#endif
#if defined(ISVPRINT) || defined(UNF)
*/libultra_d.a:*.o(COMMON);
*/libultra_d.a:*.o(.scommon);
*/libultra_d.a:*.o(.*bss*);
#else
*/libultra_rom.a:*.o(COMMON);
*/libultra_rom.a:*.o(.scommon);
*/libultra_rom.a:*.o(.*bss*);
#endif
*/ULTRALIB.a:*.o(COMMON);
*/ULTRALIB.a:*.o(.scommon);
*/ULTRALIB.a:*.o(.*bss*);
*/libhvqm2.a:*.o(.bss*);
*/librtc.a:*.o(.bss*);
*/libz.a:*.o(.bss*);