From 9894690618d6640cca3c091651e30b53e43cc841 Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Wed, 8 Feb 2023 21:59:55 -0400 Subject: make: Move runtime files to their proper place, and order in the binary --- obj_files.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/obj_files.mk b/obj_files.mk index baea650..8632b6c 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -3,16 +3,6 @@ O_FILES := $(BUILD_DIR)/src/main.o \ $(BUILD_DIR)/src/pso/TMainTask.o \ $(BUILD_DIR)/src/pso/TObject.o \ $(BUILD_DIR)/src/pso/TObject2.o \ - $(BUILD_DIR)/src/Runtime/__va_arg.o \ - $(BUILD_DIR)/src/Runtime/global_destructor_chain.o \ - $(BUILD_DIR)/src/Runtime/NMWException.o \ - $(BUILD_DIR)/src/Runtime/ptmf.o \ - $(BUILD_DIR)/src/Runtime/runtime.o \ - $(BUILD_DIR)/src/Runtime/__init_cpp_exceptions.o \ - $(BUILD_DIR)/asm/Runtime/ExceptionPPC.o \ - $(BUILD_DIR)/src/Runtime/GCN_mem_alloc.o \ - $(BUILD_DIR)/src/Dolphin/os/__start.o \ - $(BUILD_DIR)/src/Dolphin/os/__ppc_eabi_init.o \ $(BUILD_DIR)/src/Dolphin/PPCArch.o \ $(BUILD_DIR)/src/Dolphin/db.o \ $(BUILD_DIR)/src/Dolphin/os/OS.o \ @@ -36,6 +26,8 @@ O_FILES := $(BUILD_DIR)/src/main.o \ $(BUILD_DIR)/src/Dolphin/os/OSSync.o \ $(BUILD_DIR)/src/Dolphin/os/OSThread.o \ $(BUILD_DIR)/src/Dolphin/os/OSTime.o \ + $(BUILD_DIR)/src/Dolphin/os/__start.o \ + $(BUILD_DIR)/src/Dolphin/os/__ppc_eabi_init.o \ $(BUILD_DIR)/src/Dolphin/mtx/mtx.o \ $(BUILD_DIR)/src/Dolphin/mtx/mtxvec.o \ $(BUILD_DIR)/src/Dolphin/mtx/mtx44.o \ @@ -115,6 +107,15 @@ O_FILES := $(BUILD_DIR)/src/main.o \ $(BUILD_DIR)/asm/TRK_MINNOW_DOLPHIN/main_TRK.o \ $(BUILD_DIR)/asm/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.o \ $(BUILD_DIR)/asm/TRK_MINNOW_DOLPHIN/targcont.o \ + $(BUILD_DIR)/src/Runtime/__va_arg.o \ + $(BUILD_DIR)/src/Runtime/global_destructor_chain.o \ + $(BUILD_DIR)/src/Runtime/NMWException.o \ + $(BUILD_DIR)/src/Runtime/ptmf.o \ + $(BUILD_DIR)/src/Runtime/runtime.o \ + $(BUILD_DIR)/src/Runtime/__init_cpp_exceptions.o \ + $(BUILD_DIR)/src/Runtime/__mem.o \ + $(BUILD_DIR)/asm/Runtime/ExceptionPPC.o \ + $(BUILD_DIR)/src/Runtime/GCN_mem_alloc.o \ $(BUILD_DIR)/src/MSL_C.PPCEABI.bare.H/abort_exit.o \ $(BUILD_DIR)/src/MSL_C.PPCEABI.bare.H/alloc.o \ $(BUILD_DIR)/src/MSL_C.PPCEABI.bare.H/ansi_files.o \ @@ -150,5 +151,4 @@ O_FILES := $(BUILD_DIR)/src/main.o \ $(BUILD_DIR)/asm/OdemuExi2/DebuggerDriver.o \ $(BUILD_DIR)/asm/odenotstub/odenotstub.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/common_float_tables.o \ - $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/exponentialsf.o \ - $(BUILD_DIR)/src/Runtime/__mem.o + $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/exponentialsf.o -- cgit v1.2.3-13-gbd6f