diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/_fseek.s b/asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/_fseek.s rename to asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/fseek.s b/asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/fseek.s rename to asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/ftell.s b/asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/ftell.s rename to asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/abort.s b/asm/MSL_C/MSL_Common/Src/abort_exit/abort.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/abort.s rename to asm/MSL_C/MSL_Common/Src/abort_exit/abort.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/exit.s b/asm/MSL_C/MSL_Common/Src/abort_exit/exit.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/exit.s rename to asm/MSL_C/MSL_Common/Src/abort_exit/exit.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/__pool_free.s b/asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/__pool_free.s rename to asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s b/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s rename to asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_var_pools.s b/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_var_pools.s rename to asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/free.s b/asm/MSL_C/MSL_Common/Src/alloc/free.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/free.s rename to asm/MSL_C/MSL_Common/Src/alloc/free.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__close_all.s b/asm/MSL_C/MSL_Common/Src/ansi_files/__close_all.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__close_all.s rename to asm/MSL_C/MSL_Common/Src/ansi_files/__close_all.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__flush_all.s b/asm/MSL_C/MSL_Common/Src/ansi_files/__flush_all.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__flush_all.s rename to asm/MSL_C/MSL_Common/Src/ansi_files/__flush_all.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/abs.s b/asm/MSL_C/MSL_Common/Src/arith/abs.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/abs.s rename to asm/MSL_C/MSL_Common/Src/arith/abs.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/div.s b/asm/MSL_C/MSL_Common/Src/arith/div.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/div.s rename to asm/MSL_C/MSL_Common/Src/arith/div.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__flush_buffer.s b/asm/MSL_C/MSL_Common/Src/buffer_io/__flush_buffer.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__flush_buffer.s rename to asm/MSL_C/MSL_Common/Src/buffer_io/__flush_buffer.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__prep_buffer.s b/asm/MSL_C/MSL_Common/Src/buffer_io/__prep_buffer.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__prep_buffer.s rename to asm/MSL_C/MSL_Common/Src/buffer_io/__prep_buffer.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/__put_char.s b/asm/MSL_C/MSL_Common/Src/char_io/__put_char.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/__put_char.s rename to asm/MSL_C/MSL_Common/Src/char_io/__put_char.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/fputs.s b/asm/MSL_C/MSL_Common/Src/char_io/fputs.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/fputs.s rename to asm/MSL_C/MSL_Common/Src/char_io/fputs.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype/tolower.s b/asm/MSL_C/MSL_Common/Src/ctype/tolower.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype/tolower.s rename to asm/MSL_C/MSL_Common/Src/ctype/tolower.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/__fwrite.s b/asm/MSL_C/MSL_Common/Src/direct_io/__fwrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/__fwrite.s rename to asm/MSL_C/MSL_Common/Src/direct_io/__fwrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/fwrite.s b/asm/MSL_C/MSL_Common/Src/direct_io/fwrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/fwrite.s rename to asm/MSL_C/MSL_Common/Src/direct_io/fwrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/stricmp.s b/asm/MSL_C/MSL_Common/Src/extras/stricmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/stricmp.s rename to asm/MSL_C/MSL_Common/Src/extras/stricmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/strnicmp.s b/asm/MSL_C/MSL_Common/Src/extras/strnicmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/strnicmp.s rename to asm/MSL_C/MSL_Common/Src/extras/strnicmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/__msl_strnicmp.s b/asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/__msl_strnicmp.s rename to asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fclose.s b/asm/MSL_C/MSL_Common/Src/file_io/fclose.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fclose.s rename to asm/MSL_C/MSL_Common/Src/file_io/fclose.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fflush.s b/asm/MSL_C/MSL_Common/Src/file_io/fflush.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fflush.s rename to asm/MSL_C/MSL_Common/Src/file_io/fflush.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring/wcstombs.s b/asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring/wcstombs.s rename to asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/__memrchr.s b/asm/MSL_C/MSL_Common/Src/mem/__memrchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/__memrchr.s rename to asm/MSL_C/MSL_Common/Src/mem/__memrchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memchr.s b/asm/MSL_C/MSL_Common/Src/mem/memchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memchr.s rename to asm/MSL_C/MSL_Common/Src/mem/memchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memcmp.s b/asm/MSL_C/MSL_Common/Src/mem/memcmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memcmp.s rename to asm/MSL_C/MSL_Common/Src/mem/memcmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memmove.s b/asm/MSL_C/MSL_Common/Src/mem/memmove.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memmove.s rename to asm/MSL_C/MSL_Common/Src/mem/memmove.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s b/asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s rename to asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s b/asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s rename to asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s b/asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s rename to asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s b/asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s rename to asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io/__stdio_atexit.s b/asm/MSL_C/MSL_Common/Src/misc_io/__stdio_atexit.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io/__stdio_atexit.s rename to asm/MSL_C/MSL_Common/Src/misc_io/__stdio_atexit.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__FileWrite.s b/asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__FileWrite.s rename to asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__StringWrite.s b/asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__StringWrite.s rename to asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s b/asm/MSL_C/MSL_Common/Src/printf/__pformatter.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s rename to asm/MSL_C/MSL_Common/Src/printf/__pformatter.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/double2hex.s b/asm/MSL_C/MSL_Common/Src/printf/double2hex.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/double2hex.s rename to asm/MSL_C/MSL_Common/Src/printf/double2hex.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/float2str.s b/asm/MSL_C/MSL_Common/Src/printf/float2str.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/float2str.s rename to asm/MSL_C/MSL_Common/Src/printf/float2str.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/fprintf.s b/asm/MSL_C/MSL_Common/Src/printf/fprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/fprintf.s rename to asm/MSL_C/MSL_Common/Src/printf/fprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/long2str.s b/asm/MSL_C/MSL_Common/Src/printf/long2str.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/long2str.s rename to asm/MSL_C/MSL_Common/Src/printf/long2str.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/longlong2str.s b/asm/MSL_C/MSL_Common/Src/printf/longlong2str.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/longlong2str.s rename to asm/MSL_C/MSL_Common/Src/printf/longlong2str.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/parse_format.s b/asm/MSL_C/MSL_Common/Src/printf/parse_format.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/parse_format.s rename to asm/MSL_C/MSL_Common/Src/printf/parse_format.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/printf.s b/asm/MSL_C/MSL_Common/Src/printf/printf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/printf.s rename to asm/MSL_C/MSL_Common/Src/printf/printf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/round_decimal.s b/asm/MSL_C/MSL_Common/Src/printf/round_decimal.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/round_decimal.s rename to asm/MSL_C/MSL_Common/Src/printf/round_decimal.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/snprintf.s b/asm/MSL_C/MSL_Common/Src/printf/snprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/snprintf.s rename to asm/MSL_C/MSL_Common/Src/printf/snprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/sprintf.s b/asm/MSL_C/MSL_Common/Src/printf/sprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/sprintf.s rename to asm/MSL_C/MSL_Common/Src/printf/sprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vprintf.s b/asm/MSL_C/MSL_Common/Src/printf/vprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vprintf.s rename to asm/MSL_C/MSL_Common/Src/printf/vprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s b/asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s rename to asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf/__StringRead.s b/asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf/__StringRead.s rename to asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal/raise.s b/asm/MSL_C/MSL_Common/Src/signal/raise.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal/raise.s rename to asm/MSL_C/MSL_Common/Src/signal/raise.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcat.s b/asm/MSL_C/MSL_Common/Src/string/strcat.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcat.s rename to asm/MSL_C/MSL_Common/Src/string/strcat.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strchr.s b/asm/MSL_C/MSL_Common/Src/string/strchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strchr.s rename to asm/MSL_C/MSL_Common/Src/string/strchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcmp.s b/asm/MSL_C/MSL_Common/Src/string/strcmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcmp.s rename to asm/MSL_C/MSL_Common/Src/string/strcmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcpy.s b/asm/MSL_C/MSL_Common/Src/string/strcpy.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcpy.s rename to asm/MSL_C/MSL_Common/Src/string/strcpy.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strlen.s b/asm/MSL_C/MSL_Common/Src/string/strlen.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strlen.s rename to asm/MSL_C/MSL_Common/Src/string/strlen.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncmp.s b/asm/MSL_C/MSL_Common/Src/string/strncmp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncmp.s rename to asm/MSL_C/MSL_Common/Src/string/strncmp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncpy.s b/asm/MSL_C/MSL_Common/Src/string/strncpy.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncpy.s rename to asm/MSL_C/MSL_Common/Src/string/strncpy.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strrchr.s b/asm/MSL_C/MSL_Common/Src/string/strrchr.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strrchr.s rename to asm/MSL_C/MSL_Common/Src/string/strrchr.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/__strtoul.s b/asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/__strtoul.s rename to asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtol.s b/asm/MSL_C/MSL_Common/Src/strtoul/strtol.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtol.s rename to asm/MSL_C/MSL_Common/Src/strtoul/strtol.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtoul.s b/asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtoul.s rename to asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io/fwide.s b/asm/MSL_C/MSL_Common/Src/wchar_io/fwide.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io/fwide.s rename to asm/MSL_C/MSL_Common/Src/wchar_io/fwide.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s rename to asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s rename to asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s rename to asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s rename to asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos/__ieee754_acos.s b/asm/MSL_C/Math/Double_precision/e_acos/__ieee754_acos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos/__ieee754_acos.s rename to asm/MSL_C/Math/Double_precision/e_acos/__ieee754_acos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin/__ieee754_asin.s b/asm/MSL_C/Math/Double_precision/e_asin/__ieee754_asin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin/__ieee754_asin.s rename to asm/MSL_C/Math/Double_precision/e_asin/__ieee754_asin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2/__ieee754_atan2.s b/asm/MSL_C/Math/Double_precision/e_atan2/__ieee754_atan2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2/__ieee754_atan2.s rename to asm/MSL_C/Math/Double_precision/e_atan2/__ieee754_atan2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp/__ieee754_exp.s b/asm/MSL_C/Math/Double_precision/e_exp/__ieee754_exp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp/__ieee754_exp.s rename to asm/MSL_C/Math/Double_precision/e_exp/__ieee754_exp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod/__ieee754_fmod.s b/asm/MSL_C/Math/Double_precision/e_fmod/__ieee754_fmod.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod/__ieee754_fmod.s rename to asm/MSL_C/Math/Double_precision/e_fmod/__ieee754_fmod.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow/__ieee754_pow.s b/asm/MSL_C/Math/Double_precision/e_pow/__ieee754_pow.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow/__ieee754_pow.s rename to asm/MSL_C/Math/Double_precision/e_pow/__ieee754_pow.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s b/asm/MSL_C/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s rename to asm/MSL_C/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt/__ieee754_sqrt.s b/asm/MSL_C/Math/Double_precision/e_sqrt/__ieee754_sqrt.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt/__ieee754_sqrt.s rename to asm/MSL_C/Math/Double_precision/e_sqrt/__ieee754_sqrt.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos/__kernel_cos.s b/asm/MSL_C/Math/Double_precision/k_cos/__kernel_cos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos/__kernel_cos.s rename to asm/MSL_C/Math/Double_precision/k_cos/__kernel_cos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s b/asm/MSL_C/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s rename to asm/MSL_C/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin/__kernel_sin.s b/asm/MSL_C/Math/Double_precision/k_sin/__kernel_sin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin/__kernel_sin.s rename to asm/MSL_C/Math/Double_precision/k_sin/__kernel_sin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan/__kernel_tan.s b/asm/MSL_C/Math/Double_precision/k_tan/__kernel_tan.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan/__kernel_tan.s rename to asm/MSL_C/Math/Double_precision/k_tan/__kernel_tan.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan/atan.s b/asm/MSL_C/Math/Double_precision/s_atan/atan.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan/atan.s rename to asm/MSL_C/Math/Double_precision/s_atan/atan.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil/ceil.s b/asm/MSL_C/Math/Double_precision/s_ceil/ceil.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil/ceil.s rename to asm/MSL_C/Math/Double_precision/s_ceil/ceil.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign/copysign.s b/asm/MSL_C/Math/Double_precision/s_copysign/copysign.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign/copysign.s rename to asm/MSL_C/Math/Double_precision/s_copysign/copysign.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos/cos.s b/asm/MSL_C/Math/Double_precision/s_cos/cos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos/cos.s rename to asm/MSL_C/Math/Double_precision/s_cos/cos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor/floor.s b/asm/MSL_C/Math/Double_precision/s_floor/floor.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor/floor.s rename to asm/MSL_C/Math/Double_precision/s_floor/floor.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp/frexp.s b/asm/MSL_C/Math/Double_precision/s_frexp/frexp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp/frexp.s rename to asm/MSL_C/Math/Double_precision/s_frexp/frexp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp/ldexp.s b/asm/MSL_C/Math/Double_precision/s_ldexp/ldexp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp/ldexp.s rename to asm/MSL_C/Math/Double_precision/s_ldexp/ldexp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf/modf.s b/asm/MSL_C/Math/Double_precision/s_modf/modf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf/modf.s rename to asm/MSL_C/Math/Double_precision/s_modf/modf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin/sin.s b/asm/MSL_C/Math/Double_precision/s_sin/sin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin/sin.s rename to asm/MSL_C/Math/Double_precision/s_sin/sin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan/tan.s b/asm/MSL_C/Math/Double_precision/s_tan/tan.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan/tan.s rename to asm/MSL_C/Math/Double_precision/s_tan/tan.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos/acos.s b/asm/MSL_C/Math/Double_precision/w_acos/acos.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos/acos.s rename to asm/MSL_C/Math/Double_precision/w_acos/acos.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin/asin.s b/asm/MSL_C/Math/Double_precision/w_asin/asin.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin/asin.s rename to asm/MSL_C/Math/Double_precision/w_asin/asin.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2/atan2.s b/asm/MSL_C/Math/Double_precision/w_atan2/atan2.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2/atan2.s rename to asm/MSL_C/Math/Double_precision/w_atan2/atan2.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp/exp.s b/asm/MSL_C/Math/Double_precision/w_exp/exp.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp/exp.s rename to asm/MSL_C/Math/Double_precision/w_exp/exp.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod/fmod.s b/asm/MSL_C/Math/Double_precision/w_fmod/fmod.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod/fmod.s rename to asm/MSL_C/Math/Double_precision/w_fmod/fmod.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow/pow.s b/asm/MSL_C/Math/Double_precision/w_pow/pow.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow/pow.s rename to asm/MSL_C/Math/Double_precision/w_pow/pow.s diff --git a/asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt/sqrt.s b/asm/MSL_C/Math/Double_precision/w_sqrt/sqrt.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt/sqrt.s rename to asm/MSL_C/Math/Double_precision/w_sqrt/sqrt.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/acosf.s b/asm/MSL_C/PPC_EABI/Src/math_ppc/acosf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/acosf.s rename to asm/MSL_C/PPC_EABI/Src/math_ppc/acosf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/cosf.s b/asm/MSL_C/PPC_EABI/Src/math_ppc/cosf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/cosf.s rename to asm/MSL_C/PPC_EABI/Src/math_ppc/cosf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/sinf.s b/asm/MSL_C/PPC_EABI/Src/math_ppc/sinf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/sinf.s rename to asm/MSL_C/PPC_EABI/Src/math_ppc/sinf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/tanf.s b/asm/MSL_C/PPC_EABI/Src/math_ppc/tanf.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/tanf.s rename to asm/MSL_C/PPC_EABI/Src/math_ppc/tanf.s diff --git a/asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn/__write_console.s b/asm/MSL_C/PPC_EABI/Src/uart_console_io_gcn/__write_console.s similarity index 100% rename from asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn/__write_console.s rename to asm/MSL_C/PPC_EABI/Src/uart_console_io_gcn/__write_console.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGRead.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGRead.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBRead.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBRead.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBWrite.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBWrite.s diff --git a/asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s b/asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/MWCallback.s similarity index 100% rename from asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s rename to asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/MWCallback.s diff --git a/defs/module0.py b/defs/module0.py index 0856c6e23d5..2b9f1f5646c 100644 --- a/defs/module0.py +++ b/defs/module0.py @@ -45,7 +45,7 @@ LIBRARIES = [ "dolphin/card", "dolphin/gx", "dolphin/gd", - "MSL_C.PPCEABI.bare.H", + "MSL_C", "TRK_MINNOW_DOLPHIN", "amcstubs", "odemuexi2", @@ -679,7 +679,7 @@ TRANSLATION_UNITS = [ "MSL_Common/Src/arith", "MSL_Common/Src/buffer_io", "MSL_Common/Src/char_io", - "PPC_EABI/SRC/critical_regions.gamecube", + "PPC_EABI/Src/critical_regions.gamecube", "MSL_Common/Src/ctype", "MSL_Common/Src/direct_io", "MSL_Common/Src/file_io", @@ -695,7 +695,7 @@ TRANSLATION_UNITS = [ "MSL_Common/Src/string", "MSL_Common/Src/strtoul", "MSL_Common/Src/wchar_io", - "PPC_EABI/SRC/uart_console_io_gcn", + "PPC_EABI/Src/uart_console_io_gcn", "Math/Double_precision/e_acos", "Math/Double_precision/e_asin", "Math/Double_precision/e_atan2", @@ -724,7 +724,7 @@ TRANSLATION_UNITS = [ "Math/Double_precision/w_fmod", "Math/Double_precision/w_pow", "Math/Double_precision/e_sqrt", - "PPC_EABI/SRC/math_ppc", + "PPC_EABI/Src/math_ppc", "Math/Double_precision/w_sqrt", "MSL_Common/Src/extras", "MetroTRK/Portable/mainloop", diff --git a/docs/re_notes.md b/docs/re_notes.md index ee98567624f..fee297028f0 100644 --- a/docs/re_notes.md +++ b/docs/re_notes.md @@ -139,8 +139,8 @@ J2DTevBlock4 | 180 J2DTevBlock8 | 292 J2DTevBlock16 | 436 J2DTexMtx | 84 -J2DTextbox | 312 -J2DTextboxEx | 328 +J2DTextBox | 312 +J2DTextBoxEx | 328 J2DWindow | 328 J2DWindowEx | 384 J3DAnmClusterFull | 20 diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 7d92ef4caea..d3a929b176f 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -3,7 +3,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JUtility/TColor.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "dolphin/types.h" class J2DPrint { diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index fcf49010769..73580e83a78 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,7 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dolphin/gx/GX.h" #include "dolphin/types.h" diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.h b/include/MSL_C/MSL_Common/Src/FILE_POS.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.h rename to include/MSL_C/MSL_Common/Src/FILE_POS.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.h b/include/MSL_C/MSL_Common/Src/abort_exit.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.h rename to include/MSL_C/MSL_Common/Src/abort_exit.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.h b/include/MSL_C/MSL_Common/Src/alloc.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.h rename to include/MSL_C/MSL_Common/Src/alloc.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h b/include/MSL_C/MSL_Common/Src/ansi_files.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h rename to include/MSL_C/MSL_Common/Src/ansi_files.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.h b/include/MSL_C/MSL_Common/Src/arith.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.h rename to include/MSL_C/MSL_Common/Src/arith.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.h b/include/MSL_C/MSL_Common/Src/buffer_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.h rename to include/MSL_C/MSL_Common/Src/buffer_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h b/include/MSL_C/MSL_Common/Src/char_io.h similarity index 74% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h rename to include/MSL_C/MSL_Common/Src/char_io.h index e874b625ba6..7363bc22cdd 100644 --- a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h +++ b/include/MSL_C/MSL_Common/Src/char_io.h @@ -1,7 +1,7 @@ #ifndef MSL_COMMON_SRC_CHAR_IO_H #define MSL_COMMON_SRC_CHAR_IO_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h" +#include "MSL_C/MSL_Common/Src/ansi_files.h" #include "dolphin/types.h" extern "C" int fputs(const char*, FILE*); diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.h b/include/MSL_C/MSL_Common/Src/ctype.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.h rename to include/MSL_C/MSL_Common/Src/ctype.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.h b/include/MSL_C/MSL_Common/Src/direct_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.h rename to include/MSL_C/MSL_Common/Src/direct_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.h b/include/MSL_C/MSL_Common/Src/errno.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.h rename to include/MSL_C/MSL_Common/Src/errno.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.h b/include/MSL_C/MSL_Common/Src/extras.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.h rename to include/MSL_C/MSL_Common/Src/extras.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.h b/include/MSL_C/MSL_Common/Src/file_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.h rename to include/MSL_C/MSL_Common/Src/file_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h b/include/MSL_C/MSL_Common/Src/float.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h rename to include/MSL_C/MSL_Common/Src/float.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.h b/include/MSL_C/MSL_Common/Src/mbstring.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.h rename to include/MSL_C/MSL_Common/Src/mbstring.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h b/include/MSL_C/MSL_Common/Src/mem.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h rename to include/MSL_C/MSL_Common/Src/mem.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.h b/include/MSL_C/MSL_Common/Src/mem_funcs.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.h rename to include/MSL_C/MSL_Common/Src/mem_funcs.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.h b/include/MSL_C/MSL_Common/Src/misc_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.h rename to include/MSL_C/MSL_Common/Src/misc_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h b/include/MSL_C/MSL_Common/Src/printf.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h rename to include/MSL_C/MSL_Common/Src/printf.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.h b/include/MSL_C/MSL_Common/Src/scanf.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.h rename to include/MSL_C/MSL_Common/Src/scanf.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.h b/include/MSL_C/MSL_Common/Src/signal.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.h rename to include/MSL_C/MSL_Common/Src/signal.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h b/include/MSL_C/MSL_Common/Src/string.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h rename to include/MSL_C/MSL_Common/Src/string.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.h b/include/MSL_C/MSL_Common/Src/strtoul.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.h rename to include/MSL_C/MSL_Common/Src/strtoul.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.h b/include/MSL_C/MSL_Common/Src/wchar_io.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.h rename to include/MSL_C/MSL_Common/Src/wchar_io.h diff --git a/include/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.h b/include/MSL_C/MSL_Common_Embedded/Src/ansi_fp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.h rename to include/MSL_C/MSL_Common_Embedded/Src/ansi_fp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.h b/include/MSL_C/Math/Double_precision/e_acos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.h rename to include/MSL_C/Math/Double_precision/e_acos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.h b/include/MSL_C/Math/Double_precision/e_asin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.h rename to include/MSL_C/Math/Double_precision/e_asin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.h b/include/MSL_C/Math/Double_precision/e_atan2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.h rename to include/MSL_C/Math/Double_precision/e_atan2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.h b/include/MSL_C/Math/Double_precision/e_exp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.h rename to include/MSL_C/Math/Double_precision/e_exp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.h b/include/MSL_C/Math/Double_precision/e_fmod.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.h rename to include/MSL_C/Math/Double_precision/e_fmod.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.h b/include/MSL_C/Math/Double_precision/e_pow.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.h rename to include/MSL_C/Math/Double_precision/e_pow.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.h b/include/MSL_C/Math/Double_precision/e_rem_pio2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.h rename to include/MSL_C/Math/Double_precision/e_rem_pio2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.h b/include/MSL_C/Math/Double_precision/e_sqrt.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.h rename to include/MSL_C/Math/Double_precision/e_sqrt.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.h b/include/MSL_C/Math/Double_precision/k_cos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.h rename to include/MSL_C/Math/Double_precision/k_cos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.h b/include/MSL_C/Math/Double_precision/k_rem_pio2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.h rename to include/MSL_C/Math/Double_precision/k_rem_pio2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.h b/include/MSL_C/Math/Double_precision/k_sin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.h rename to include/MSL_C/Math/Double_precision/k_sin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.h b/include/MSL_C/Math/Double_precision/k_tan.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.h rename to include/MSL_C/Math/Double_precision/k_tan.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.h b/include/MSL_C/Math/Double_precision/s_atan.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.h rename to include/MSL_C/Math/Double_precision/s_atan.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.h b/include/MSL_C/Math/Double_precision/s_ceil.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.h rename to include/MSL_C/Math/Double_precision/s_ceil.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.h b/include/MSL_C/Math/Double_precision/s_copysign.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.h rename to include/MSL_C/Math/Double_precision/s_copysign.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.h b/include/MSL_C/Math/Double_precision/s_cos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.h rename to include/MSL_C/Math/Double_precision/s_cos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.h b/include/MSL_C/Math/Double_precision/s_floor.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.h rename to include/MSL_C/Math/Double_precision/s_floor.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.h b/include/MSL_C/Math/Double_precision/s_frexp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.h rename to include/MSL_C/Math/Double_precision/s_frexp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.h b/include/MSL_C/Math/Double_precision/s_ldexp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.h rename to include/MSL_C/Math/Double_precision/s_ldexp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.h b/include/MSL_C/Math/Double_precision/s_modf.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.h rename to include/MSL_C/Math/Double_precision/s_modf.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.h b/include/MSL_C/Math/Double_precision/s_sin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.h rename to include/MSL_C/Math/Double_precision/s_sin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.h b/include/MSL_C/Math/Double_precision/s_tan.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.h rename to include/MSL_C/Math/Double_precision/s_tan.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.h b/include/MSL_C/Math/Double_precision/w_acos.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.h rename to include/MSL_C/Math/Double_precision/w_acos.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.h b/include/MSL_C/Math/Double_precision/w_asin.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.h rename to include/MSL_C/Math/Double_precision/w_asin.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.h b/include/MSL_C/Math/Double_precision/w_atan2.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.h rename to include/MSL_C/Math/Double_precision/w_atan2.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.h b/include/MSL_C/Math/Double_precision/w_exp.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.h rename to include/MSL_C/Math/Double_precision/w_exp.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.h b/include/MSL_C/Math/Double_precision/w_fmod.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.h rename to include/MSL_C/Math/Double_precision/w_fmod.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.h b/include/MSL_C/Math/Double_precision/w_pow.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.h rename to include/MSL_C/Math/Double_precision/w_pow.h diff --git a/include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.h b/include/MSL_C/Math/Double_precision/w_sqrt.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.h rename to include/MSL_C/Math/Double_precision/w_sqrt.h diff --git a/include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.h b/include/MSL_C/PPC_EABI/Src/critical_regions.gamecube.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.h rename to include/MSL_C/PPC_EABI/Src/critical_regions.gamecube.h diff --git a/include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.h b/include/MSL_C/PPC_EABI/Src/math_ppc.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.h rename to include/MSL_C/PPC_EABI/Src/math_ppc.h diff --git a/include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.h b/include/MSL_C/PPC_EABI/Src/uart_console_io_gcn.h similarity index 100% rename from include/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.h rename to include/MSL_C/PPC_EABI/Src/uart_console_io_gcn.h diff --git a/include/msl_c/math.h b/include/MSL_C/math.h similarity index 95% rename from include/msl_c/math.h rename to include/MSL_C/math.h index 844a5142514..0de55c166d8 100644 --- a/include/msl_c/math.h +++ b/include/MSL_C/math.h @@ -1,7 +1,7 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" +#include "MSL_C/MSL_Common/Src/float.h" #include "dolphin/types.h" extern "C" { diff --git a/include/msl_c/string.h b/include/MSL_C/string.h similarity index 94% rename from include/msl_c/string.h rename to include/MSL_C/string.h index 902f205f09f..bbf8425561c 100644 --- a/include/msl_c/string.h +++ b/include/MSL_C/string.h @@ -4,7 +4,7 @@ #include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" -// TODO: move to MSL_C.PPCEABI.bare.H/ +// TODO: move to MSL_C/ extern "C" { void memcpy(void*, const void*, s32); void* memset(void* dest, int ch, u32 count); diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 890e8ea64cb..6a3c1b295a5 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -4,7 +4,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" inline bool cLib_IsZero(f32 f) { return fabsf(f) < 8e-11f; diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 7f3113dd41f..54f17b81cc4 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -2,7 +2,7 @@ #define C_M3D_H_ #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" class cM3dGAab; class cM3dGCps; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index bf9c092b8ab..395540d746b 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -3,7 +3,7 @@ #include "dolphin/mtx/vec.h" #include "global.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" struct cXyz : Vec { static const cXyz Zero; diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index 93aba8f392f..b93b0c32655 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -3,8 +3,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JUtility/TColor.h" -#include "SSystem/SComponent/c_Xyz.h" -#include "SSystem/SComponent/c_sXyz.h" +#include "SSystem/SComponent/c_xyz.h" +#include "SSystem/SComponent/c_sxyz.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 3ae2dacf007..c477b4c9cbb 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -1,7 +1,7 @@ #ifndef D_MSG_D_MSG_OBJECT_H #define D_MSG_D_MSG_OBJECT_H -#include "JSystem/J2DGraph/J2DTextbox.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JMessage/control.h" #include "JSystem/JMessage/processor.h" #include "JSystem/JMessage/resource.h" diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 5079ab86ccd..ea631aa5ef9 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -1,8 +1,8 @@ #ifndef D_SAVE_D_SAVE_H #define D_SAVE_D_SAVE_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/include/init.h b/include/init.h index bfe78198e7c..43827476d9d 100644 --- a/include/init.h +++ b/include/init.h @@ -1,7 +1,7 @@ #ifndef INIT_H #define INIT_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dolphin/types.h" #endif /* INIT_H */ diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index 85c75aea138..ac80fa30503 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -1,8 +1,8 @@ #ifndef M_DO_M_DO_PRINTF_H #define M_DO_M_DO_PRINTF_H -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/char_io.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" #include "m_Do/m_Do_main.h" diff --git a/include/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h b/include/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.h similarity index 100% rename from include/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h rename to include/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.h diff --git a/include_link.mk b/include_link.mk index a5913519c0f..9f0bd28a960 100644 --- a/include_link.mk +++ b/include_link.mk @@ -42,7 +42,7 @@ -include libs/dolphin/gx/Makefile -include libs/dolphin/gd/Makefile -include libs/Runtime.PPCEABI.H/Makefile --include libs/MSL_C.PPCEABI.bare.H/Makefile +-include libs/MSL_C/Makefile -include libs/TRK_MINNOW_DOLPHIN/Makefile -include libs/amcstubs/Makefile -include libs/odemuexi2/Makefile diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index fcf21a7b487..b21ecb4b43f 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index acedc704a86..dd6b2a3889b 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J2DGraph/J2DManage.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 1ae9a766259..49a3e3487e7 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DPrint.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index ba67438d035..aa53fac2f30 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -11,7 +11,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DVertex.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/gx/GX.h" #include "dolphin/os/OSCache.h" diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp index da1f624a6c3..befab13ce84 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "dol2asm.h" -#include "dolphin/gx/gx.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/J3DU/J3DUClipper.cpp index 192667f169e..4e6e1165980 100644 --- a/libs/JSystem/J3DU/J3DUClipper.cpp +++ b/libs/JSystem/J3DU/J3DUClipper.cpp @@ -7,7 +7,7 @@ #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Forward References: diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index a6310e69a16..570cc007ce5 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -8,11 +8,11 @@ #include "JSystem/JKernel/JKRDvdAramRipper.h" #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRFile.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Types: diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp index d213d3b3fec..248821dac24 100644 --- a/libs/JSystem/JKernel/JKRArchivePri.cpp +++ b/libs/JSystem/JKernel/JKRArchivePri.cpp @@ -5,8 +5,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/ctype.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/ctype.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp index c8549929780..5a0884456c8 100644 --- a/libs/JSystem/JKernel/JKRFileCache.cpp +++ b/libs/JSystem/JKernel/JKRFileCache.cpp @@ -7,8 +7,8 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRFileFinder.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/ctype.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/ctype.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "global.h" diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp index db9e0b531af..88e153fef80 100644 --- a/libs/JSystem/JKernel/JKRFileLoader.cpp +++ b/libs/JSystem/JKernel/JKRFileLoader.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JKernel/JKRFileLoader.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "global.h" @@ -193,10 +193,10 @@ SECTION_SDATA static u8 rootPath[2 + 6 /* padding */] = { // matches, but lbl_804508C0 is accessed through r13 #ifdef NONMATCHING const char* JKRFileLoader::fetchVolumeName(char* buffer, long bufferSize, const char* path) { - // lbl_803D2D18 = MSL_C.PPCEABI.bare.H::__lower_map + // lbl_803D2D18 = MSL_C::__lower_map // lbl_8039D150 = JKernel::@stringBase0 "/" // lbl_804508C0 = JKernel::rootPath$2498 "/" - // lbl_803D2D18 = MSL_C.PPCEABI.bare.H::__lower_map + // lbl_803D2D18 = MSL_C::__lower_map if (strcmp(path, lbl_8039D150) == 0) { strcpy(buffer, lbl_804508C0); diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index 7f5de050d32..ba53b12ade9 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp index 4549de6e397..df7d46e7c8e 100644 --- a/libs/JSystem/JKernel/JKRSolidHeap.cpp +++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "dol2asm.h" #include "global.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Forward References: diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index dcecd222cdd..efe85ecfb17 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp index b19d28526a9..eeef9f62212 100644 --- a/libs/JSystem/JMath/JMATrigonometric.cpp +++ b/libs/JSystem/JMath/JMATrigonometric.cpp @@ -7,7 +7,7 @@ // #include "JSystem/JMath/JMATrigonometric.h" #include "dol2asm.h" #include "global.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" namespace std { template diff --git a/libs/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp index d0daca474eb..ad0ceb87866 100644 --- a/libs/JSystem/JParticle/JPAResourceManager.cpp +++ b/libs/JSystem/JParticle/JPAResourceManager.cpp @@ -6,7 +6,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp index 257b7295ce8..ed47dc5e4b0 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp @@ -6,7 +6,7 @@ #include "JSystem/JStudio/JStudio/functionvalue.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Types: diff --git a/libs/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp index 2274e89366e..0e03c38f781 100644 --- a/libs/JSystem/JSupport/JSUMemoryStream.cpp +++ b/libs/JSystem/JSupport/JSUMemoryStream.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JSupport/JSUMemoryStream.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index 06dcb184d53..a8d8eab20e6 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp index 1bea7c33c73..38427fe21fa 100644 --- a/libs/JSystem/JUtility/JUTDbPrint.cpp +++ b/libs/JSystem/JUtility/JUTDbPrint.cpp @@ -6,8 +6,8 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JUtility/JUTVideo.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp index 5c84f565d28..b6830c059da 100644 --- a/libs/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/JUtility/JUTDirectPrint.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index e947e620ba0..c6e108d9ea5 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -6,8 +6,8 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/float.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp index 7ab0818cab3..49de4d5d667 100644 --- a/libs/JSystem/JUtility/JUTNameTab.cpp +++ b/libs/JSystem/JUtility/JUTNameTab.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTNameTab.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/Makefile b/libs/MSL_C.PPCEABI.bare.H/Makefile deleted file mode 100644 index bd74e7615d5..00000000000 --- a/libs/MSL_C.PPCEABI.bare.H/Makefile +++ /dev/null @@ -1,139 +0,0 @@ -# -# Generated By: dol2asm -# - -LIBMSL_C_PPCEABI_BARE_H_A_CPP_FILES := \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp \ - libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp \ - libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp \ - libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp \ - libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp \ - -LIBMSL_C_PPCEABI_BARE_H_A_O_FILES := \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.o \ - $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.o \ - -LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS := \ - -LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS := \ - -nodefaults \ - -fp hard \ - -proc gekko \ - -linkmode moreram \ - -$(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) - @echo linking... $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a - @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles - @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles - -$(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/%.o: libs/MSL_C.PPCEABI.bare.H/%.cpp - @mkdir -p $(@D) - @echo building... $< - @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) -c -o $@ $(basename $@).cpp - diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp b/libs/MSL_C/MSL_Common/Src/FILE_POS.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp rename to libs/MSL_C/MSL_Common/Src/FILE_POS.cpp index dc0ae3a2154..76dd37390f1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp +++ b/libs/MSL_C/MSL_Common/Src/FILE_POS.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/FILE_POS // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.h" +#include "MSL_C/MSL_Common/Src/FILE_POS.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,7 +34,7 @@ extern "C" extern u8 errno[4 + 4 /* padding */]; #pragma optimizewithasm off asm void fseek() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/fseek.s" +#include "asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s" } #pragma pop @@ -44,7 +44,7 @@ asm void fseek() { #pragma optimizewithasm off static asm void _fseek() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/_fseek.s" +#include "asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s" } #pragma pop @@ -54,6 +54,6 @@ static asm void _fseek() { #pragma optimizewithasm off asm void ftell() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS/ftell.s" +#include "asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp b/libs/MSL_C/MSL_Common/Src/abort_exit.cpp similarity index 90% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp rename to libs/MSL_C/MSL_Common/Src/abort_exit.cpp index 9d0ea565af4..c7014cb234c 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp +++ b/libs/MSL_C/MSL_Common/Src/abort_exit.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/abort_exit // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.h" +#include "MSL_C/MSL_Common/Src/abort_exit.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -54,7 +54,7 @@ static u8 __console_exit[4]; #pragma optimizewithasm off asm void exit() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/exit.s" +#include "asm/MSL_C/MSL_Common/Src/abort_exit/exit.s" } #pragma pop @@ -64,7 +64,7 @@ asm void exit() { #pragma optimizewithasm off asm void abort() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit/abort.s" +#include "asm/MSL_C/MSL_Common/Src/abort_exit/abort.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp b/libs/MSL_C/MSL_Common/Src/alloc.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp rename to libs/MSL_C/MSL_Common/Src/alloc.cpp index f38ae99f3a1..de11b1b541b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp +++ b/libs/MSL_C/MSL_Common/Src/alloc.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/alloc // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.h" +#include "MSL_C/MSL_Common/Src/alloc.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -40,7 +40,7 @@ static u8 protopool[56]; #pragma optimizewithasm off asm void free() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/free.s" +#include "asm/MSL_C/MSL_Common/Src/alloc/free.s" } #pragma pop @@ -50,7 +50,7 @@ asm void free() { #pragma optimizewithasm off asm void __pool_free() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/__pool_free.s" +#include "asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s" } #pragma pop @@ -68,7 +68,7 @@ COMPILER_STRIP_GATE(0x803A2220, &fix_pool_sizes); #pragma optimizewithasm off static asm void deallocate_from_fixed_pools() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s" +#include "asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s" } #pragma pop @@ -78,6 +78,6 @@ static asm void deallocate_from_fixed_pools() { #pragma optimizewithasm off static asm void deallocate_from_var_pools() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc/deallocate_from_var_pools.s" +#include "asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp b/libs/MSL_C/MSL_Common/Src/ansi_files.cpp similarity index 96% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp rename to libs/MSL_C/MSL_Common/Src/ansi_files.cpp index 305d7d11bc9..7aa06d6f385 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp +++ b/libs/MSL_C/MSL_Common/Src/ansi_files.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/ansi_files // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.h" +#include "MSL_C/MSL_Common/Src/ansi_files.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -127,7 +127,7 @@ static u8 stdin_buff[256]; #pragma optimizewithasm off asm void __flush_all() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__flush_all.s" +#include "asm/MSL_C/MSL_Common/Src/ansi_files/__flush_all.s" } #pragma pop @@ -137,6 +137,6 @@ asm void __flush_all() { #pragma optimizewithasm off asm void __close_all() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files/__close_all.s" +#include "asm/MSL_C/MSL_Common/Src/ansi_files/__close_all.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp b/libs/MSL_C/MSL_Common/Src/arith.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp rename to libs/MSL_C/MSL_Common/Src/arith.cpp index 4a639118902..41273b24e89 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.cpp +++ b/libs/MSL_C/MSL_Common/Src/arith.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/arith // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith.h" +#include "MSL_C/MSL_Common/Src/arith.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -28,7 +28,7 @@ extern "C" void abs(); #pragma optimizewithasm off asm void div() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/div.s" +#include "asm/MSL_C/MSL_Common/Src/arith/div.s" } #pragma pop @@ -38,6 +38,6 @@ asm void div() { #pragma optimizewithasm off asm void abs() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/arith/abs.s" +#include "asm/MSL_C/MSL_Common/Src/arith/abs.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp b/libs/MSL_C/MSL_Common/Src/buffer_io.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp rename to libs/MSL_C/MSL_Common/Src/buffer_io.cpp index e386cffd171..a74b79c5385 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.cpp +++ b/libs/MSL_C/MSL_Common/Src/buffer_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/buffer_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io.h" +#include "MSL_C/MSL_Common/Src/buffer_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -28,7 +28,7 @@ extern "C" void __prep_buffer(); #pragma optimizewithasm off asm void __flush_buffer() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__flush_buffer.s" +#include "asm/MSL_C/MSL_Common/Src/buffer_io/__flush_buffer.s" } #pragma pop @@ -38,6 +38,6 @@ asm void __flush_buffer() { #pragma optimizewithasm off asm void __prep_buffer() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/buffer_io/__prep_buffer.s" +#include "asm/MSL_C/MSL_Common/Src/buffer_io/__prep_buffer.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp b/libs/MSL_C/MSL_Common/Src/char_io.cpp similarity index 81% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp rename to libs/MSL_C/MSL_Common/Src/char_io.cpp index 9cdd5b0a742..31308c70c2b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.cpp +++ b/libs/MSL_C/MSL_Common/Src/char_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/char_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io.h" +#include "MSL_C/MSL_Common/Src/char_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,7 +35,7 @@ extern "C" void fwide(); #pragma optimizewithasm off asm int fputs(const char*, FILE*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/fputs.s" +#include "asm/MSL_C/MSL_Common/Src/char_io/fputs.s" } #pragma pop @@ -45,6 +45,6 @@ asm int fputs(const char*, FILE*) { #pragma optimizewithasm off asm void __put_char() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/char_io/__put_char.s" +#include "asm/MSL_C/MSL_Common/Src/char_io/__put_char.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp b/libs/MSL_C/MSL_Common/Src/ctype.cpp similarity index 97% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp rename to libs/MSL_C/MSL_Common/Src/ctype.cpp index 3cb84bcfe81..1fcc9b05271 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp +++ b/libs/MSL_C/MSL_Common/Src/ctype.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/ctype // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.h" +#include "MSL_C/MSL_Common/Src/ctype.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -68,7 +68,7 @@ SECTION_DATA extern u8 __lower_map[256] = { #pragma optimizewithasm off asm int tolower(int) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype/tolower.s" +#include "asm/MSL_C/MSL_Common/Src/ctype/tolower.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp b/libs/MSL_C/MSL_Common/Src/direct_io.cpp similarity index 82% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp rename to libs/MSL_C/MSL_Common/Src/direct_io.cpp index 1c8c0af11b4..ab240bccef9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.cpp +++ b/libs/MSL_C/MSL_Common/Src/direct_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/direct_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io.h" +#include "MSL_C/MSL_Common/Src/direct_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -38,7 +38,7 @@ extern "C" void fwide(); #pragma optimizewithasm off asm void __fwrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/__fwrite.s" +#include "asm/MSL_C/MSL_Common/Src/direct_io/__fwrite.s" } #pragma pop @@ -48,6 +48,6 @@ asm void __fwrite() { #pragma optimizewithasm off asm void fwrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/direct_io/fwrite.s" +#include "asm/MSL_C/MSL_Common/Src/direct_io/fwrite.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp b/libs/MSL_C/MSL_Common/Src/errno.cpp similarity index 90% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp rename to libs/MSL_C/MSL_Common/Src/errno.cpp index b5d1d0d58f5..f96ecd63375 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp +++ b/libs/MSL_C/MSL_Common/Src/errno.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/errno // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.h" +#include "MSL_C/MSL_Common/Src/errno.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp b/libs/MSL_C/MSL_Common/Src/extras.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp rename to libs/MSL_C/MSL_Common/Src/extras.cpp index b79d4dd7db5..3d210715327 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp +++ b/libs/MSL_C/MSL_Common/Src/extras.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/extras // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.h" +#include "MSL_C/MSL_Common/Src/extras.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -31,7 +31,7 @@ extern "C" extern u8 __lower_map[256]; #pragma optimizewithasm off asm void strnicmp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/strnicmp.s" +#include "asm/MSL_C/MSL_Common/Src/extras/strnicmp.s" } #pragma pop @@ -41,6 +41,6 @@ asm void strnicmp() { #pragma optimizewithasm off asm void stricmp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras/stricmp.s" +#include "asm/MSL_C/MSL_Common/Src/extras/stricmp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp b/libs/MSL_C/MSL_Common/Src/file_io.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp rename to libs/MSL_C/MSL_Common/Src/file_io.cpp index 6b06df0f37b..1f78637fa66 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp +++ b/libs/MSL_C/MSL_Common/Src/file_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/file_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.h" +#include "MSL_C/MSL_Common/Src/file_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,7 +35,7 @@ extern "C" extern u8 __lower_map[256]; #pragma optimizewithasm off asm void __msl_strnicmp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/__msl_strnicmp.s" +#include "asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s" } #pragma pop @@ -45,7 +45,7 @@ asm void __msl_strnicmp() { #pragma optimizewithasm off asm void fflush() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fflush.s" +#include "asm/MSL_C/MSL_Common/Src/file_io/fflush.s" } #pragma pop @@ -55,6 +55,6 @@ asm void fflush() { #pragma optimizewithasm off asm void fclose() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io/fclose.s" +#include "asm/MSL_C/MSL_Common/Src/file_io/fclose.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp b/libs/MSL_C/MSL_Common/Src/float.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp rename to libs/MSL_C/MSL_Common/Src/float.cpp index bcb41b3acd1..ec43cf90b45 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp +++ b/libs/MSL_C/MSL_Common/Src/float.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/float // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" +#include "MSL_C/MSL_Common/Src/float.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp b/libs/MSL_C/MSL_Common/Src/mbstring.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp rename to libs/MSL_C/MSL_Common/Src/mbstring.cpp index 3ca1ccf4251..9599770fa8a 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.cpp +++ b/libs/MSL_C/MSL_Common/Src/mbstring.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/mbstring // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring.h" +#include "MSL_C/MSL_Common/Src/mbstring.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -37,6 +37,6 @@ SECTION_SDATA2 static u32 lit_74[1 + 1 /* padding */] = { #pragma optimizewithasm off asm void wcstombs() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mbstring/wcstombs.s" +#include "asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp b/libs/MSL_C/MSL_Common/Src/mem.cpp similarity index 80% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp rename to libs/MSL_C/MSL_Common/Src/mem.cpp index c9b3feb5ff4..0037ddf0f8b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.cpp +++ b/libs/MSL_C/MSL_Common/Src/mem.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/mem // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h" +#include "MSL_C/MSL_Common/Src/mem.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,7 +34,7 @@ extern "C" void __copy_longs_aligned(); #pragma optimizewithasm off asm int memcmp(const void*, const void*, size_t) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memcmp.s" +#include "asm/MSL_C/MSL_Common/Src/mem/memcmp.s" } #pragma pop @@ -44,7 +44,7 @@ asm int memcmp(const void*, const void*, size_t) { #pragma optimizewithasm off asm void __memrchr() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/__memrchr.s" +#include "asm/MSL_C/MSL_Common/Src/mem/__memrchr.s" } #pragma pop @@ -54,7 +54,7 @@ asm void __memrchr() { #pragma optimizewithasm off asm void memchr() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memchr.s" +#include "asm/MSL_C/MSL_Common/Src/mem/memchr.s" } #pragma pop @@ -64,6 +64,6 @@ asm void memchr() { #pragma optimizewithasm off asm void memmove() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem/memmove.s" +#include "asm/MSL_C/MSL_Common/Src/mem/memmove.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp b/libs/MSL_C/MSL_Common/Src/mem_funcs.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp rename to libs/MSL_C/MSL_Common/Src/mem_funcs.cpp index 0b0fb6b7662..8da43ba8033 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.cpp +++ b/libs/MSL_C/MSL_Common/Src/mem_funcs.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/mem_funcs // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs.h" +#include "MSL_C/MSL_Common/Src/mem_funcs.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -30,7 +30,7 @@ extern "C" void __copy_longs_aligned(); #pragma optimizewithasm off asm void __copy_longs_rev_unaligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s" +#include "asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_rev_unaligned.s" } #pragma pop @@ -40,7 +40,7 @@ asm void __copy_longs_rev_unaligned() { #pragma optimizewithasm off asm void __copy_longs_unaligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s" +#include "asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_unaligned.s" } #pragma pop @@ -50,7 +50,7 @@ asm void __copy_longs_unaligned() { #pragma optimizewithasm off asm void __copy_longs_rev_aligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s" +#include "asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_rev_aligned.s" } #pragma pop @@ -60,6 +60,6 @@ asm void __copy_longs_rev_aligned() { #pragma optimizewithasm off asm void __copy_longs_aligned() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s" +#include "asm/MSL_C/MSL_Common/Src/mem_funcs/__copy_longs_aligned.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp b/libs/MSL_C/MSL_Common/Src/misc_io.cpp similarity index 79% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp rename to libs/MSL_C/MSL_Common/Src/misc_io.cpp index 82338b2e1e1..851de5b75d4 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp +++ b/libs/MSL_C/MSL_Common/Src/misc_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/misc_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.h" +#include "MSL_C/MSL_Common/Src/misc_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -30,6 +30,6 @@ extern "C" extern u8 __stdio_exit[4]; #pragma optimizewithasm off asm void __stdio_atexit() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io/__stdio_atexit.s" +#include "asm/MSL_C/MSL_Common/Src/misc_io/__stdio_atexit.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp b/libs/MSL_C/MSL_Common/Src/printf.cpp similarity index 91% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp rename to libs/MSL_C/MSL_Common/Src/printf.cpp index 297b0395187..81abda1770f 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp +++ b/libs/MSL_C/MSL_Common/Src/printf.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/printf // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -54,7 +54,7 @@ extern "C" extern u8 __ctype_map[256]; #pragma optimizewithasm off asm size_t sprintf(const char*, const char*, ...) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/sprintf.s" +#include "asm/MSL_C/MSL_Common/Src/printf/sprintf.s" } #pragma pop @@ -64,7 +64,7 @@ asm size_t sprintf(const char*, const char*, ...) { #pragma optimizewithasm off asm size_t snprintf(const char*, size_t, const char*, ...) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/snprintf.s" +#include "asm/MSL_C/MSL_Common/Src/printf/snprintf.s" } #pragma pop @@ -74,7 +74,7 @@ asm size_t snprintf(const char*, size_t, const char*, ...) { #pragma optimizewithasm off asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s" +#include "asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s" } #pragma pop @@ -84,7 +84,7 @@ asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_li #pragma optimizewithasm off asm size_t vprintf(const char*, va_list) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vprintf.s" +#include "asm/MSL_C/MSL_Common/Src/printf/vprintf.s" } #pragma pop @@ -94,7 +94,7 @@ asm size_t vprintf(const char*, va_list) { #pragma optimizewithasm off asm void fprintf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/fprintf.s" +#include "asm/MSL_C/MSL_Common/Src/printf/fprintf.s" } #pragma pop @@ -104,7 +104,7 @@ asm void fprintf() { #pragma optimizewithasm off asm size_t printf(const char*, ...) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/printf.s" +#include "asm/MSL_C/MSL_Common/Src/printf/printf.s" } #pragma pop @@ -114,7 +114,7 @@ asm size_t printf(const char*, ...) { #pragma optimizewithasm off asm void __StringWrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__StringWrite.s" +#include "asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s" } #pragma pop @@ -124,7 +124,7 @@ asm void __StringWrite() { #pragma optimizewithasm off asm void __FileWrite() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__FileWrite.s" +#include "asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s" } #pragma pop @@ -155,7 +155,7 @@ SECTION_SDATA static u8 data_80450AD8[2 + 6 /* padding */] = { asm void __pformatter() { nofralloc #undef __va_arg -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s" +#include "asm/MSL_C/MSL_Common/Src/printf/__pformatter.s" } #pragma pop @@ -186,7 +186,7 @@ SECTION_SDATA2 static u8 lit_1089[8] = { #pragma optimizewithasm off static asm void float2str() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/float2str.s" +#include "asm/MSL_C/MSL_Common/Src/printf/float2str.s" } #pragma pop @@ -196,7 +196,7 @@ static asm void float2str() { #pragma optimizewithasm off static asm void round_decimal() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/round_decimal.s" +#include "asm/MSL_C/MSL_Common/Src/printf/round_decimal.s" } #pragma pop @@ -206,7 +206,7 @@ static asm void round_decimal() { #pragma optimizewithasm off static asm void double2hex() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/double2hex.s" +#include "asm/MSL_C/MSL_Common/Src/printf/double2hex.s" } #pragma pop @@ -238,7 +238,7 @@ SECTION_DATA static void* lit_1248[33] = { #pragma optimizewithasm off static asm void longlong2str() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/longlong2str.s" +#include "asm/MSL_C/MSL_Common/Src/printf/longlong2str.s" } #pragma pop @@ -270,7 +270,7 @@ SECTION_DATA static void* lit_1307[33] = { #pragma optimizewithasm off static asm void long2str() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/long2str.s" +#include "asm/MSL_C/MSL_Common/Src/printf/long2str.s" } #pragma pop @@ -336,7 +336,7 @@ SECTION_DATA static void* lit_1442[17 + 1 /* padding */] = { #pragma optimizewithasm off static asm void parse_format() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/parse_format.s" +#include "asm/MSL_C/MSL_Common/Src/printf/parse_format.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp b/libs/MSL_C/MSL_Common/Src/scanf.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp rename to libs/MSL_C/MSL_Common/Src/scanf.cpp index 6f35de531ef..346ecbd0777 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.cpp +++ b/libs/MSL_C/MSL_Common/Src/scanf.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/scanf // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf.h" +#include "MSL_C/MSL_Common/Src/scanf.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void __StringRead(); #pragma optimizewithasm off asm void __StringRead() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/scanf/__StringRead.s" +#include "asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp b/libs/MSL_C/MSL_Common/Src/signal.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp rename to libs/MSL_C/MSL_Common/Src/signal.cpp index 9ab9b6e3e95..73ac1de6fa5 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.cpp +++ b/libs/MSL_C/MSL_Common/Src/signal.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/signal // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal.h" +#include "MSL_C/MSL_Common/Src/signal.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,6 +35,6 @@ static u8 signal_funcs[24]; #pragma optimizewithasm off asm void raise() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/signal/raise.s" +#include "asm/MSL_C/MSL_Common/Src/signal/raise.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp b/libs/MSL_C/MSL_Common/Src/string.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp rename to libs/MSL_C/MSL_Common/Src/string.cpp index 2f18ef9c6a5..ce6e6cfbea4 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.cpp +++ b/libs/MSL_C/MSL_Common/Src/string.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/string // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -23,7 +23,7 @@ extern "C" void _epilog(); #pragma optimizewithasm off asm char* strrchr(const char*, int) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strrchr.s" +#include "asm/MSL_C/MSL_Common/Src/string/strrchr.s" } #pragma pop @@ -33,7 +33,7 @@ asm char* strrchr(const char*, int) { #pragma optimizewithasm off asm char* strchr(const char*, int) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strchr.s" +#include "asm/MSL_C/MSL_Common/Src/string/strchr.s" } #pragma pop @@ -43,7 +43,7 @@ asm char* strchr(const char*, int) { #pragma optimizewithasm off asm int strncmp(const char*, const char*, u32) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncmp.s" +#include "asm/MSL_C/MSL_Common/Src/string/strncmp.s" } #pragma pop @@ -53,7 +53,7 @@ asm int strncmp(const char*, const char*, u32) { #pragma optimizewithasm off asm int strcmp(const char*, const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcmp.s" +#include "asm/MSL_C/MSL_Common/Src/string/strcmp.s" } #pragma pop @@ -63,7 +63,7 @@ asm int strcmp(const char*, const char*) { #pragma optimizewithasm off asm char* strcat(char*, const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcat.s" +#include "asm/MSL_C/MSL_Common/Src/string/strcat.s" } #pragma pop @@ -73,7 +73,7 @@ asm char* strcat(char*, const char*) { #pragma optimizewithasm off asm char* strncpy(char*, const char*, u32) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strncpy.s" +#include "asm/MSL_C/MSL_Common/Src/string/strncpy.s" } #pragma pop @@ -83,7 +83,7 @@ asm char* strncpy(char*, const char*, u32) { #pragma optimizewithasm off asm char* strcpy(char*, const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strcpy.s" +#include "asm/MSL_C/MSL_Common/Src/string/strcpy.s" } #pragma pop @@ -93,6 +93,6 @@ asm char* strcpy(char*, const char*) { #pragma optimizewithasm off asm u32 strlen(const char*) { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/string/strlen.s" +#include "asm/MSL_C/MSL_Common/Src/string/strlen.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp b/libs/MSL_C/MSL_Common/Src/strtoul.cpp similarity index 88% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp rename to libs/MSL_C/MSL_Common/Src/strtoul.cpp index 23e601191c1..7ac0c47c61e 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp +++ b/libs/MSL_C/MSL_Common/Src/strtoul.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/strtoul // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.h" +#include "MSL_C/MSL_Common/Src/strtoul.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,7 +34,7 @@ extern "C" extern u8 errno[4 + 4 /* padding */]; #pragma optimizewithasm off asm void strtol() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtol.s" +#include "asm/MSL_C/MSL_Common/Src/strtoul/strtol.s" } #pragma pop @@ -44,7 +44,7 @@ asm void strtol() { #pragma optimizewithasm off asm void strtoul() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/strtoul.s" +#include "asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s" } #pragma pop @@ -78,6 +78,6 @@ SECTION_DATA static void* lit_431[17 + 1 /* padding */] = { #pragma optimizewithasm off asm void __strtoul() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul/__strtoul.s" +#include "asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp b/libs/MSL_C/MSL_Common/Src/wchar_io.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp rename to libs/MSL_C/MSL_Common/Src/wchar_io.cpp index ba61d0ee79e..8e71f35b422 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.cpp +++ b/libs/MSL_C/MSL_Common/Src/wchar_io.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common/Src/wchar_io // -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io.h" +#include "MSL_C/MSL_Common/Src/wchar_io.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void fwide(); #pragma optimizewithasm off asm void fwide() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/wchar_io/fwide.s" +#include "asm/MSL_C/MSL_Common/Src/wchar_io/fwide.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp b/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp similarity index 94% rename from libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp rename to libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp index a53026b27c9..7dde1664fb1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp +++ b/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp @@ -3,7 +3,7 @@ // Translation Unit: MSL_Common_Embedded/Src/ansi_fp // -#include "MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.h" +#include "MSL_C/MSL_Common_Embedded/Src/ansi_fp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -38,7 +38,7 @@ extern "C" void modf(); #pragma optimizewithasm off asm void __num2dec() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s" +#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s" } #pragma pop @@ -54,7 +54,7 @@ SECTION_SDATA2 static u8 lit_824[8] = { #pragma optimizewithasm off asm void __num2dec_internal() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s" +#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s" } #pragma pop @@ -175,7 +175,7 @@ SECTION_DATA static void* lit_1710[73 + 1 /* padding */] = { #pragma optimizewithasm off asm void __two_exp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s" +#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s" } #pragma pop @@ -185,7 +185,7 @@ asm void __two_exp() { #pragma optimizewithasm off asm void __timesdec() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s" +#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s" } #pragma pop diff --git a/libs/MSL_C/Makefile b/libs/MSL_C/Makefile new file mode 100644 index 00000000000..eda4f12ce3c --- /dev/null +++ b/libs/MSL_C/Makefile @@ -0,0 +1,139 @@ +# +# Generated By: dol2asm +# + +LIBMSL_C_PPCEABI_BARE_H_A_CPP_FILES := \ + libs/MSL_C/MSL_Common/Src/abort_exit.cpp \ + libs/MSL_C/MSL_Common/Src/alloc.cpp \ + libs/MSL_C/MSL_Common/Src/errno.cpp \ + libs/MSL_C/MSL_Common/Src/ansi_files.cpp \ + libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp \ + libs/MSL_C/MSL_Common/Src/arith.cpp \ + libs/MSL_C/MSL_Common/Src/buffer_io.cpp \ + libs/MSL_C/MSL_Common/Src/char_io.cpp \ + libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.cpp \ + libs/MSL_C/MSL_Common/Src/ctype.cpp \ + libs/MSL_C/MSL_Common/Src/direct_io.cpp \ + libs/MSL_C/MSL_Common/Src/file_io.cpp \ + libs/MSL_C/MSL_Common/Src/FILE_POS.cpp \ + libs/MSL_C/MSL_Common/Src/mbstring.cpp \ + libs/MSL_C/MSL_Common/Src/mem.cpp \ + libs/MSL_C/MSL_Common/Src/mem_funcs.cpp \ + libs/MSL_C/MSL_Common/Src/misc_io.cpp \ + libs/MSL_C/MSL_Common/Src/printf.cpp \ + libs/MSL_C/MSL_Common/Src/scanf.cpp \ + libs/MSL_C/MSL_Common/Src/float.cpp \ + libs/MSL_C/MSL_Common/Src/signal.cpp \ + libs/MSL_C/MSL_Common/Src/string.cpp \ + libs/MSL_C/MSL_Common/Src/strtoul.cpp \ + libs/MSL_C/MSL_Common/Src/wchar_io.cpp \ + libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.cpp \ + libs/MSL_C/Math/Double_precision/e_acos.cpp \ + libs/MSL_C/Math/Double_precision/e_asin.cpp \ + libs/MSL_C/Math/Double_precision/e_atan2.cpp \ + libs/MSL_C/Math/Double_precision/e_exp.cpp \ + libs/MSL_C/Math/Double_precision/e_fmod.cpp \ + libs/MSL_C/Math/Double_precision/e_pow.cpp \ + libs/MSL_C/Math/Double_precision/e_rem_pio2.cpp \ + libs/MSL_C/Math/Double_precision/k_cos.cpp \ + libs/MSL_C/Math/Double_precision/k_rem_pio2.cpp \ + libs/MSL_C/Math/Double_precision/k_sin.cpp \ + libs/MSL_C/Math/Double_precision/k_tan.cpp \ + libs/MSL_C/Math/Double_precision/s_atan.cpp \ + libs/MSL_C/Math/Double_precision/s_ceil.cpp \ + libs/MSL_C/Math/Double_precision/s_copysign.cpp \ + libs/MSL_C/Math/Double_precision/s_cos.cpp \ + libs/MSL_C/Math/Double_precision/s_floor.cpp \ + libs/MSL_C/Math/Double_precision/s_frexp.cpp \ + libs/MSL_C/Math/Double_precision/s_ldexp.cpp \ + libs/MSL_C/Math/Double_precision/s_modf.cpp \ + libs/MSL_C/Math/Double_precision/s_sin.cpp \ + libs/MSL_C/Math/Double_precision/s_tan.cpp \ + libs/MSL_C/Math/Double_precision/w_acos.cpp \ + libs/MSL_C/Math/Double_precision/w_asin.cpp \ + libs/MSL_C/Math/Double_precision/w_atan2.cpp \ + libs/MSL_C/Math/Double_precision/w_exp.cpp \ + libs/MSL_C/Math/Double_precision/w_fmod.cpp \ + libs/MSL_C/Math/Double_precision/w_pow.cpp \ + libs/MSL_C/Math/Double_precision/e_sqrt.cpp \ + libs/MSL_C/PPC_EABI/Src/math_ppc.cpp \ + libs/MSL_C/Math/Double_precision/w_sqrt.cpp \ + libs/MSL_C/MSL_Common/Src/extras.cpp \ + +LIBMSL_C_PPCEABI_BARE_H_A_O_FILES := \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/abort_exit.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/alloc.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/errno.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/ansi_files.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/arith.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/buffer_io.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/char_io.o \ + $(BUILD_DIR)/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/ctype.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/direct_io.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/file_io.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/FILE_POS.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/mbstring.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/mem.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/mem_funcs.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/misc_io.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/printf.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/scanf.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/float.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/signal.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/string.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/strtoul.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/wchar_io.o \ + $(BUILD_DIR)/libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_acos.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_asin.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_atan2.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_exp.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_fmod.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_pow.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_rem_pio2.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_cos.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_rem_pio2.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_sin.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_tan.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_atan.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_ceil.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_copysign.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_cos.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_floor.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_frexp.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_ldexp.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_modf.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_sin.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_tan.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_acos.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_asin.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_atan2.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_exp.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_fmod.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_pow.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_sqrt.o \ + $(BUILD_DIR)/libs/MSL_C/PPC_EABI/Src/math_ppc.o \ + $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_sqrt.o \ + $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/extras.o \ + +LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS := \ + +LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS := \ + -nodefaults \ + -fp hard \ + -proc gekko \ + -linkmode moreram \ + +$(BUILD_DIR)/libMSL_C.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) + @echo linking... $(BUILD_DIR)/libMSL_C.a + @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles + @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libMSL_C.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles + +$(BUILD_DIR)/libs/MSL_C/%.o: libs/MSL_C/%.cpp + @mkdir -p $(@D) + @echo building... $< + @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) -c -o $@ $(basename $@).cpp + diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp b/libs/MSL_C/Math/Double_precision/e_acos.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp rename to libs/MSL_C/Math/Double_precision/e_acos.cpp index 2a8c8c1ce9f..49f917ccb18 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp +++ b/libs/MSL_C/Math/Double_precision/e_acos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_acos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.h" +#include "MSL_C/Math/Double_precision/e_acos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -84,6 +84,6 @@ SECTION_SDATA2 static f64 lit_99 = 2.0; #pragma optimizewithasm off asm void __ieee754_acos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos/__ieee754_acos.s" +#include "asm/MSL_C/Math/Double_precision/e_acos/__ieee754_acos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp b/libs/MSL_C/Math/Double_precision/e_asin.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp rename to libs/MSL_C/Math/Double_precision/e_asin.cpp index 19312da8711..7f601e4c6bf 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp +++ b/libs/MSL_C/Math/Double_precision/e_asin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_asin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.h" +#include "MSL_C/Math/Double_precision/e_asin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -82,6 +82,6 @@ SECTION_SDATA2 static f64 lit_110 = 0.7853981633974483; #pragma optimizewithasm off asm void __ieee754_asin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin/__ieee754_asin.s" +#include "asm/MSL_C/Math/Double_precision/e_asin/__ieee754_asin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp b/libs/MSL_C/Math/Double_precision/e_atan2.cpp similarity index 93% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp rename to libs/MSL_C/Math/Double_precision/e_atan2.cpp index f6977ff0bbb..bba40e9696b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp +++ b/libs/MSL_C/Math/Double_precision/e_atan2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_atan2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.h" +#include "MSL_C/Math/Double_precision/e_atan2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -65,6 +65,6 @@ SECTION_SDATA2 static f64 lit_155 = 1.2246467991473532e-16; #pragma optimizewithasm off asm void __ieee754_atan2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2/__ieee754_atan2.s" +#include "asm/MSL_C/Math/Double_precision/e_atan2/__ieee754_atan2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp b/libs/MSL_C/Math/Double_precision/e_exp.cpp similarity index 96% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp rename to libs/MSL_C/Math/Double_precision/e_exp.cpp index 8d2d406741d..c78a9f7d53d 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp +++ b/libs/MSL_C/Math/Double_precision/e_exp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_exp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.h" +#include "MSL_C/Math/Double_precision/e_exp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -99,6 +99,6 @@ SECTION_SDATA2 static f64 lit_131 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __ieee754_exp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp/__ieee754_exp.s" +#include "asm/MSL_C/Math/Double_precision/e_exp/__ieee754_exp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp b/libs/MSL_C/Math/Double_precision/e_fmod.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp rename to libs/MSL_C/Math/Double_precision/e_fmod.cpp index 1b74d42b5c7..fc46e258691 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp +++ b/libs/MSL_C/Math/Double_precision/e_fmod.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_fmod // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.h" +#include "MSL_C/Math/Double_precision/e_fmod.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,6 +34,6 @@ COMPILER_STRIP_GATE(0x803A2370, &Zero); #pragma optimizewithasm off asm void __ieee754_fmod() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod/__ieee754_fmod.s" +#include "asm/MSL_C/Math/Double_precision/e_fmod/__ieee754_fmod.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp b/libs/MSL_C/Math/Double_precision/e_pow.cpp similarity index 97% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp rename to libs/MSL_C/Math/Double_precision/e_pow.cpp index 31528583cf1..310be3d34ab 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp +++ b/libs/MSL_C/Math/Double_precision/e_pow.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_pow // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.h" +#include "MSL_C/Math/Double_precision/e_pow.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -161,6 +161,6 @@ SECTION_SDATA2 static f64 lit_370 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __ieee754_pow() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow/__ieee754_pow.s" +#include "asm/MSL_C/Math/Double_precision/e_pow/__ieee754_pow.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp b/libs/MSL_C/Math/Double_precision/e_rem_pio2.cpp similarity index 96% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp rename to libs/MSL_C/Math/Double_precision/e_rem_pio2.cpp index 8589524abed..d6677ddff1b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp +++ b/libs/MSL_C/Math/Double_precision/e_rem_pio2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_rem_pio2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.h" +#include "MSL_C/Math/Double_precision/e_rem_pio2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -100,6 +100,6 @@ SECTION_SDATA2 static f64 lit_157 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __ieee754_rem_pio2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s" +#include "asm/MSL_C/Math/Double_precision/e_rem_pio2/__ieee754_rem_pio2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp b/libs/MSL_C/Math/Double_precision/e_sqrt.cpp similarity index 83% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp rename to libs/MSL_C/Math/Double_precision/e_sqrt.cpp index e63833cc43c..a54a115c59c 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp +++ b/libs/MSL_C/Math/Double_precision/e_sqrt.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/e_sqrt // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.h" +#include "MSL_C/Math/Double_precision/e_sqrt.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -34,6 +34,6 @@ SECTION_SDATA2 static f64 lit_164 = 1.0; #pragma optimizewithasm off asm void __ieee754_sqrt() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt/__ieee754_sqrt.s" +#include "asm/MSL_C/Math/Double_precision/e_sqrt/__ieee754_sqrt.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp b/libs/MSL_C/Math/Double_precision/k_cos.cpp similarity index 92% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp rename to libs/MSL_C/Math/Double_precision/k_cos.cpp index 8615f144ce9..8b52238de4a 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp +++ b/libs/MSL_C/Math/Double_precision/k_cos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_cos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.h" +#include "MSL_C/Math/Double_precision/k_cos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -55,6 +55,6 @@ SECTION_SDATA2 static f64 lit_73 = 0.28125; #pragma optimizewithasm off asm void __kernel_cos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos/__kernel_cos.s" +#include "asm/MSL_C/Math/Double_precision/k_cos/__kernel_cos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp b/libs/MSL_C/Math/Double_precision/k_rem_pio2.cpp similarity index 94% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp rename to libs/MSL_C/Math/Double_precision/k_rem_pio2.cpp index b649cf87817..7f632503bdf 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp +++ b/libs/MSL_C/Math/Double_precision/k_rem_pio2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_rem_pio2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.h" +#include "MSL_C/Math/Double_precision/k_rem_pio2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -74,6 +74,6 @@ SECTION_SDATA2 static f64 lit_445 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __kernel_rem_pio2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s" +#include "asm/MSL_C/Math/Double_precision/k_rem_pio2/__kernel_rem_pio2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp b/libs/MSL_C/Math/Double_precision/k_sin.cpp similarity index 91% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp rename to libs/MSL_C/Math/Double_precision/k_sin.cpp index 9c2df87ffd2..dd1f7021fa9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp +++ b/libs/MSL_C/Math/Double_precision/k_sin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_sin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.h" +#include "MSL_C/Math/Double_precision/k_sin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -49,6 +49,6 @@ SECTION_SDATA2 static f64 lit_66 = 0.5; #pragma optimizewithasm off asm void __kernel_sin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin/__kernel_sin.s" +#include "asm/MSL_C/Math/Double_precision/k_sin/__kernel_sin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp b/libs/MSL_C/Math/Double_precision/k_tan.cpp similarity index 94% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp rename to libs/MSL_C/Math/Double_precision/k_tan.cpp index ea40a790ca2..d9b04e8f8a3 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp +++ b/libs/MSL_C/Math/Double_precision/k_tan.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/k_tan // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.h" +#include "MSL_C/Math/Double_precision/k_tan.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -63,6 +63,6 @@ SECTION_SDATA2 static f64 lit_101 = 4503601774854144.0 /* cast s32 to float */; #pragma optimizewithasm off asm void __kernel_tan() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan/__kernel_tan.s" +#include "asm/MSL_C/Math/Double_precision/k_tan/__kernel_tan.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp b/libs/MSL_C/Math/Double_precision/s_atan.cpp similarity index 95% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp rename to libs/MSL_C/Math/Double_precision/s_atan.cpp index 553bf2d2c13..41dbd4859d6 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp +++ b/libs/MSL_C/Math/Double_precision/s_atan.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_atan // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.h" +#include "MSL_C/Math/Double_precision/s_atan.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -74,6 +74,6 @@ SECTION_SDATA2 static f64 lit_119 = -1.0; #pragma optimizewithasm off asm void atan() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan/atan.s" +#include "asm/MSL_C/Math/Double_precision/s_atan/atan.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp b/libs/MSL_C/Math/Double_precision/s_ceil.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp rename to libs/MSL_C/Math/Double_precision/s_ceil.cpp index 6db65ef52d0..c93a5506c75 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp +++ b/libs/MSL_C/Math/Double_precision/s_ceil.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_ceil // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.h" +#include "MSL_C/Math/Double_precision/s_ceil.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -36,6 +36,6 @@ SECTION_SDATA2 static u8 lit_125[8] = { #pragma optimizewithasm off asm void ceil() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil/ceil.s" +#include "asm/MSL_C/Math/Double_precision/s_ceil/ceil.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp b/libs/MSL_C/Math/Double_precision/s_copysign.cpp similarity index 75% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp rename to libs/MSL_C/Math/Double_precision/s_copysign.cpp index f1359067957..5e27a452d11 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.cpp +++ b/libs/MSL_C/Math/Double_precision/s_copysign.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_copysign // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign.h" +#include "MSL_C/Math/Double_precision/s_copysign.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void copysign(); #pragma optimizewithasm off asm void copysign() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_copysign/copysign.s" +#include "asm/MSL_C/Math/Double_precision/s_copysign/copysign.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp b/libs/MSL_C/Math/Double_precision/s_cos.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp rename to libs/MSL_C/Math/Double_precision/s_cos.cpp index 2b8fecbe054..f929cfa6dc1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.cpp +++ b/libs/MSL_C/Math/Double_precision/s_cos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_cos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos.h" +#include "MSL_C/Math/Double_precision/s_cos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -37,6 +37,6 @@ SECTION_SDATA2 static u8 lit_67[8] = { #pragma optimizewithasm off asm void cos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_cos/cos.s" +#include "asm/MSL_C/Math/Double_precision/s_cos/cos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp b/libs/MSL_C/Math/Double_precision/s_floor.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp rename to libs/MSL_C/Math/Double_precision/s_floor.cpp index b33fa81cb4f..b18fe988194 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp +++ b/libs/MSL_C/Math/Double_precision/s_floor.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_floor // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.h" +#include "MSL_C/Math/Double_precision/s_floor.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -36,6 +36,6 @@ SECTION_SDATA2 static u8 lit_125[8] = { #pragma optimizewithasm off asm void floor() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor/floor.s" +#include "asm/MSL_C/Math/Double_precision/s_floor/floor.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp b/libs/MSL_C/Math/Double_precision/s_frexp.cpp similarity index 82% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp rename to libs/MSL_C/Math/Double_precision/s_frexp.cpp index c72caac9cbc..f9ddfc68654 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp +++ b/libs/MSL_C/Math/Double_precision/s_frexp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_frexp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.h" +#include "MSL_C/Math/Double_precision/s_frexp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -31,6 +31,6 @@ SECTION_SDATA2 static f64 lit_57 = 1.8014398509481984e+16; #pragma optimizewithasm off asm void frexp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp/frexp.s" +#include "asm/MSL_C/Math/Double_precision/s_frexp/frexp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp b/libs/MSL_C/Math/Double_precision/s_ldexp.cpp similarity index 89% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp rename to libs/MSL_C/Math/Double_precision/s_ldexp.cpp index 82f9dc13c32..6f99499ba62 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp +++ b/libs/MSL_C/Math/Double_precision/s_ldexp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_ldexp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.h" +#include "MSL_C/Math/Double_precision/s_ldexp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -47,6 +47,6 @@ SECTION_SDATA2 static f64 lit_95 = 5.551115123125783e-17; #pragma optimizewithasm off asm void ldexp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp/ldexp.s" +#include "asm/MSL_C/Math/Double_precision/s_ldexp/ldexp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp b/libs/MSL_C/Math/Double_precision/s_modf.cpp similarity index 76% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp rename to libs/MSL_C/Math/Double_precision/s_modf.cpp index a7397441e88..00348526db2 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.cpp +++ b/libs/MSL_C/Math/Double_precision/s_modf.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_modf // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf.h" +#include "MSL_C/Math/Double_precision/s_modf.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -27,6 +27,6 @@ extern "C" void modf(); #pragma optimizewithasm off asm void modf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_modf/modf.s" +#include "asm/MSL_C/Math/Double_precision/s_modf/modf.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp b/libs/MSL_C/Math/Double_precision/s_sin.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp rename to libs/MSL_C/Math/Double_precision/s_sin.cpp index 2bfe22499a9..516f21184a3 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.cpp +++ b/libs/MSL_C/Math/Double_precision/s_sin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_sin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin.h" +#include "MSL_C/Math/Double_precision/s_sin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -37,6 +37,6 @@ SECTION_SDATA2 static u8 lit_67[8] = { #pragma optimizewithasm off asm void sin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_sin/sin.s" +#include "asm/MSL_C/Math/Double_precision/s_sin/sin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp b/libs/MSL_C/Math/Double_precision/s_tan.cpp similarity index 85% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp rename to libs/MSL_C/Math/Double_precision/s_tan.cpp index c4249d5865c..9542b030cb9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.cpp +++ b/libs/MSL_C/Math/Double_precision/s_tan.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/s_tan // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan.h" +#include "MSL_C/Math/Double_precision/s_tan.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -36,6 +36,6 @@ SECTION_SDATA2 static u8 lit_58[8] = { #pragma optimizewithasm off asm void tan() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_tan/tan.s" +#include "asm/MSL_C/Math/Double_precision/s_tan/tan.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp b/libs/MSL_C/Math/Double_precision/w_acos.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp rename to libs/MSL_C/Math/Double_precision/w_acos.cpp index 36c12c515bb..7108ae082cb 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.cpp +++ b/libs/MSL_C/Math/Double_precision/w_acos.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_acos // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos.h" +#include "MSL_C/Math/Double_precision/w_acos.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_acos(); #pragma optimizewithasm off asm void acos() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_acos/acos.s" +#include "asm/MSL_C/Math/Double_precision/w_acos/acos.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp b/libs/MSL_C/Math/Double_precision/w_asin.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp rename to libs/MSL_C/Math/Double_precision/w_asin.cpp index 847b5b496de..ae7db8510e1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.cpp +++ b/libs/MSL_C/Math/Double_precision/w_asin.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_asin // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin.h" +#include "MSL_C/Math/Double_precision/w_asin.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_asin(); #pragma optimizewithasm off asm void asin() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_asin/asin.s" +#include "asm/MSL_C/Math/Double_precision/w_asin/asin.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp b/libs/MSL_C/Math/Double_precision/w_atan2.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp rename to libs/MSL_C/Math/Double_precision/w_atan2.cpp index effa2db5cde..4e97e2cfaba 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.cpp +++ b/libs/MSL_C/Math/Double_precision/w_atan2.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_atan2 // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2.h" +#include "MSL_C/Math/Double_precision/w_atan2.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_atan2(); #pragma optimizewithasm off asm void atan2() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_atan2/atan2.s" +#include "asm/MSL_C/Math/Double_precision/w_atan2/atan2.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp b/libs/MSL_C/Math/Double_precision/w_exp.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp rename to libs/MSL_C/Math/Double_precision/w_exp.cpp index fc501983efb..13e6c78b57b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.cpp +++ b/libs/MSL_C/Math/Double_precision/w_exp.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_exp // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp.h" +#include "MSL_C/Math/Double_precision/w_exp.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_exp(); #pragma optimizewithasm off asm void exp() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_exp/exp.s" +#include "asm/MSL_C/Math/Double_precision/w_exp/exp.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp b/libs/MSL_C/Math/Double_precision/w_fmod.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp rename to libs/MSL_C/Math/Double_precision/w_fmod.cpp index a5e8eb40364..adf0b076ea1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.cpp +++ b/libs/MSL_C/Math/Double_precision/w_fmod.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_fmod // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod.h" +#include "MSL_C/Math/Double_precision/w_fmod.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_fmod(); #pragma optimizewithasm off asm void fmod() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_fmod/fmod.s" +#include "asm/MSL_C/Math/Double_precision/w_fmod/fmod.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp b/libs/MSL_C/Math/Double_precision/w_pow.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp rename to libs/MSL_C/Math/Double_precision/w_pow.cpp index 06a0aa11b35..7d05a7cdeca 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.cpp +++ b/libs/MSL_C/Math/Double_precision/w_pow.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_pow // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow.h" +#include "MSL_C/Math/Double_precision/w_pow.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_pow(); #pragma optimizewithasm off asm void pow() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_pow/pow.s" +#include "asm/MSL_C/Math/Double_precision/w_pow/pow.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp b/libs/MSL_C/Math/Double_precision/w_sqrt.cpp similarity index 77% rename from libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp rename to libs/MSL_C/Math/Double_precision/w_sqrt.cpp index 9e43b87f39e..64d3d136875 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.cpp +++ b/libs/MSL_C/Math/Double_precision/w_sqrt.cpp @@ -3,7 +3,7 @@ // Translation Unit: Math/Double_precision/w_sqrt // -#include "MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt.h" +#include "MSL_C/Math/Double_precision/w_sqrt.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -29,6 +29,6 @@ extern "C" void __ieee754_sqrt(); #pragma optimizewithasm off asm void sqrt() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/Math/Double_precision/w_sqrt/sqrt.s" +#include "asm/MSL_C/Math/Double_precision/w_sqrt/sqrt.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp b/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.cpp similarity index 84% rename from libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp rename to libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.cpp index a396672bdff..4a394513284 100644 --- a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.cpp +++ b/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.cpp @@ -1,9 +1,9 @@ // // Generated By: dol2asm -// Translation Unit: PPC_EABI/SRC/critical_regions.gamecube +// Translation Unit: PPC_EABI/Src/critical_regions.gamecube // -#include "MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/critical_regions.gamecube.h" +#include "MSL_C/PPC_EABI/Src/critical_regions.gamecube.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp b/libs/MSL_C/PPC_EABI/Src/math_ppc.cpp similarity index 75% rename from libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp rename to libs/MSL_C/PPC_EABI/Src/math_ppc.cpp index e783612853b..0341e415020 100644 --- a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.cpp +++ b/libs/MSL_C/PPC_EABI/Src/math_ppc.cpp @@ -1,9 +1,9 @@ // // Generated By: dol2asm -// Translation Unit: PPC_EABI/SRC/math_ppc +// Translation Unit: PPC_EABI/Src/math_ppc // -#include "MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc.h" +#include "MSL_C/PPC_EABI/Src/math_ppc.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -35,7 +35,7 @@ extern "C" void acos(); #pragma optimizewithasm off asm void tanf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/tanf.s" +#include "asm/MSL_C/PPC_EABI/Src/math_ppc/tanf.s" } #pragma pop @@ -45,7 +45,7 @@ asm void tanf() { #pragma optimizewithasm off asm void sinf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/sinf.s" +#include "asm/MSL_C/PPC_EABI/Src/math_ppc/sinf.s" } #pragma pop @@ -55,7 +55,7 @@ asm void sinf() { #pragma optimizewithasm off asm void cosf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/cosf.s" +#include "asm/MSL_C/PPC_EABI/Src/math_ppc/cosf.s" } #pragma pop @@ -65,6 +65,6 @@ asm void cosf() { #pragma optimizewithasm off asm void acosf() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/math_ppc/acosf.s" +#include "asm/MSL_C/PPC_EABI/Src/math_ppc/acosf.s" } #pragma pop diff --git a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp b/libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.cpp similarity index 81% rename from libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp rename to libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.cpp index 8def84ba255..0309c708869 100644 --- a/libs/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.cpp +++ b/libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.cpp @@ -1,9 +1,9 @@ // // Generated By: dol2asm -// Translation Unit: PPC_EABI/SRC/uart_console_io_gcn +// Translation Unit: PPC_EABI/Src/uart_console_io_gcn // -#include "MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn.h" +#include "MSL_C/PPC_EABI/Src/uart_console_io_gcn.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -42,6 +42,6 @@ static u8 initialized[4 + 4 /* padding */]; #pragma optimizewithasm off asm void __write_console() { nofralloc -#include "asm/MSL_C.PPCEABI.bare.H/PPC_EABI/SRC/uart_console_io_gcn/__write_console.s" +#include "asm/MSL_C/PPC_EABI/Src/uart_console_io_gcn/__write_console.s" } #pragma pop diff --git a/libs/SSystem/SComponent/c_angle.cpp b/libs/SSystem/SComponent/c_angle.cpp index fc888484558..a3c91d3482c 100644 --- a/libs/SSystem/SComponent/c_angle.cpp +++ b/libs/SSystem/SComponent/c_angle.cpp @@ -6,7 +6,7 @@ #include "SSystem/SComponent/c_angle.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" extern f32 cM_atan2f(f32, f32); diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp index 2bd9e0c918c..4ec0554af58 100644 --- a/libs/SSystem/SComponent/c_lib.cpp +++ b/libs/SSystem/SComponent/c_lib.cpp @@ -5,13 +5,13 @@ #include "SSystem/SComponent/c_lib.h" #include "JSystem/JMath/JMath.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 055f5f793f6..55da543cd6c 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -15,7 +15,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Forward References: diff --git a/libs/SSystem/SComponent/c_m3d_g_pla.cpp b/libs/SSystem/SComponent/c_m3d_g_pla.cpp index 926ada4d09c..8cc49f9f518 100644 --- a/libs/SSystem/SComponent/c_m3d_g_pla.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_pla.cpp @@ -7,7 +7,7 @@ #include "SSystem/SComponent/c_m3d.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/SSystem/SComponent/c_math.cpp b/libs/SSystem/SComponent/c_math.cpp index 2b797c69ea5..66849752129 100644 --- a/libs/SSystem/SComponent/c_math.cpp +++ b/libs/SSystem/SComponent/c_math.cpp @@ -7,7 +7,7 @@ #include "SSystem/SComponent/c_m3d.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp index da21b451412..3416b38ada6 100644 --- a/libs/SSystem/SComponent/c_xyz.cpp +++ b/libs/SSystem/SComponent/c_xyz.cpp @@ -7,7 +7,7 @@ #include "SSystem/SComponent/c_math.h" #include "dol2asm.h" #include "global.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp index 214f3d8f79f..47280b8a767 100644 --- a/libs/Z2AudioLib/Z2Calc.cpp +++ b/libs/Z2AudioLib/Z2Calc.cpp @@ -7,7 +7,7 @@ #include "JSystem/JMath/random.h" #include "dol2asm.h" #include "global.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/dolphin/mtx/mtx.cpp b/libs/dolphin/mtx/mtx.cpp index 5e1e2339c98..53e335dd65a 100644 --- a/libs/dolphin/mtx/mtx.cpp +++ b/libs/dolphin/mtx/mtx.cpp @@ -7,7 +7,7 @@ #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/dolphin/mtx/mtx44.cpp b/libs/dolphin/mtx/mtx44.cpp index b53a738579e..d3d69a9e29f 100644 --- a/libs/dolphin/mtx/mtx44.cpp +++ b/libs/dolphin/mtx/mtx44.cpp @@ -6,7 +6,7 @@ #include "dolphin/mtx/mtx44.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/dolphin/mtx/quat.cpp b/libs/dolphin/mtx/quat.cpp index e4e83b38810..f53dddc5966 100644 --- a/libs/dolphin/mtx/quat.cpp +++ b/libs/dolphin/mtx/quat.cpp @@ -6,7 +6,7 @@ #include "dolphin/mtx/quat.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Declarations: diff --git a/libs/odemuexi2/Makefile b/libs/odemuexi2/Makefile index a42c27728ae..437019d19c3 100644 --- a/libs/odemuexi2/Makefile +++ b/libs/odemuexi2/Makefile @@ -3,10 +3,10 @@ # LIBODEMUEXI2_A_CPP_FILES := \ - libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp \ + libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp \ LIBODEMUEXI2_A_O_FILES := \ - $(BUILD_DIR)/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.o \ + $(BUILD_DIR)/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.o \ LIBODEMUEXI2_A_CFLAGS := \ diff --git a/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp b/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp similarity index 84% rename from libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp rename to libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp index 3bbefc22b18..21dcb6b779f 100644 --- a/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp +++ b/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp @@ -3,7 +3,7 @@ // Translation Unit: src/OdemuExi2Lib/DebuggerDriver // -#include "odemuexi2/src/OdemuExi2Lib/DebuggerDriver.h" +#include "odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -57,7 +57,7 @@ void DBOpen() { #pragma optimizewithasm off asm void DBWrite() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBWrite.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBWrite.s" } #pragma pop @@ -86,7 +86,7 @@ static u8 data_804519E4[4]; #pragma optimizewithasm off asm void DBRead() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBRead.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBRead.s" } #pragma pop @@ -96,7 +96,7 @@ asm void DBRead() { #pragma optimizewithasm off asm void DBQueryData() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBQueryData.s" } #pragma pop @@ -106,7 +106,7 @@ asm void DBQueryData() { #pragma optimizewithasm off asm void DBInitInterrupts() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBInitInterrupts.s" } #pragma pop @@ -116,7 +116,7 @@ asm void DBInitInterrupts() { #pragma optimizewithasm off asm void DBInitComm() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBInitComm.s" } #pragma pop @@ -126,7 +126,7 @@ asm void DBInitComm() { #pragma optimizewithasm off static asm void DBGHandler() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGHandler.s" } #pragma pop @@ -136,7 +136,7 @@ static asm void DBGHandler() { #pragma optimizewithasm off static asm void MWCallback() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/MWCallback.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/MWCallback.s" } #pragma pop @@ -146,7 +146,7 @@ static asm void MWCallback() { #pragma optimizewithasm off static asm void DBGReadStatus() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGReadStatus.s" } #pragma pop @@ -156,7 +156,7 @@ static asm void DBGReadStatus() { #pragma optimizewithasm off static asm void DBGWrite() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGWrite.s" } #pragma pop @@ -166,7 +166,7 @@ static asm void DBGWrite() { #pragma optimizewithasm off static asm void DBGRead() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGRead.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGRead.s" } #pragma pop @@ -176,7 +176,7 @@ static asm void DBGRead() { #pragma optimizewithasm off static asm void DBGReadMailbox() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGReadMailbox.s" } #pragma pop @@ -186,6 +186,6 @@ static asm void DBGReadMailbox() { #pragma optimizewithasm off static asm void DBGEXIImm() { nofralloc -#include "asm/odemuexi2/src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s" +#include "asm/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver/DBGEXIImm.s" } #pragma pop diff --git a/obj_files.mk b/obj_files.mk index 393d9acd948..e4366a2b99e 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -280,7 +280,7 @@ LIBS := \ $(BUILD_DIR)/libgx.a \ $(BUILD_DIR)/libgd.a \ $(BUILD_DIR)/libRuntime.PPCEABI.H.a \ - $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a \ + $(BUILD_DIR)/libMSL_C.a \ $(BUILD_DIR)/libTRK_MINNOW_DOLPHIN.a \ $(BUILD_DIR)/libamcstubs.a \ $(BUILD_DIR)/libodemuexi2.a \ diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 534d990e074..470cc646c01 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -6,7 +6,7 @@ #include "DynamicLink.h" #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTConsole.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" +#include "MSL_C/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 7866eab5a0e..5fdc07c8ab8 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -7,7 +7,7 @@ #include "DynamicLink.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 394740abb36..a47b39a049b 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -4,7 +4,7 @@ // #include "d/d_eye_hl.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" +#include "MSL_C/MSL_Common/Src/string.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/os/OS.h" diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 51d18a23b72..a7d546d29ec 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -15,7 +15,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_ext.h" -#include "m_Do/m_Do_reset.h" +#include "m_Do/m_Do_Reset.h" // // Forward References: diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 6e84d67a4e3..709ecb27178 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -4,7 +4,7 @@ // #include "d/kankyo/d_kankyo.h" -#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/mem.h" +#include "MSL_C/MSL_Common/Src/mem.h" #include "Z2AudioLib/Z2EnvSeMgr.h" #include "d/com/d_com_inf_game.h" #include "d/kankyo/d_kankyo_data.h" diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 56737dfb569..b10d6f6e025 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_malloc.h" #include "dol2asm.h" #include "global.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // #include "d/com/d_com_inf_game.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DU/J3DUClipper.h" @@ -19,7 +19,7 @@ #include "f_op/f_op_actor.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_lib.h" -#include "msl_c/math.h" +#include "MSL_C/math.h" // // Types: diff --git a/tools/lcf.py b/tools/lcf.py index 214ac5b3839..6faeb8b055c 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -389,7 +389,7 @@ ARCHIVES = [ "build/dolzel2/libgx.a", "build/dolzel2/libgd.a", "build/dolzel2/libRuntime.PPCEABI.H.a", - "build/dolzel2/libMSL_C.PPCEABI.bare.H.a", + "build/dolzel2/libMSL_C.a", "build/dolzel2/libTRK_MINNOW_DOLPHIN.a", "build/dolzel2/libamcstubs.a", "build/dolzel2/libodemuexi2.a", diff --git a/tp b/tp old mode 100755 new mode 100644