summaryrefslogtreecommitdiff
path: root/obj_files.mk
diff options
context:
space:
mode:
authorRevo <projectrevotpp@hotmail.com>2020-09-17 20:51:45 -0400
committerGitHub <noreply@github.com>2020-09-17 20:51:45 -0400
commitba1f2d9cb6e591f3017b80d958cd384cbe4d9c4e (patch)
treec7a8685104e8e4479500622245a4a23804eb1a54 /obj_files.mk
parent198be57aa4c939285a31d9f148adf7e2de290dc1 (diff)
parent52dab146835fc519e8a01de393e82950641f2c0d (diff)
Merge pull request #47 from red031000/master
split OSError, OSExec and __mem
Diffstat (limited to 'obj_files.mk')
-rw-r--r--obj_files.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/obj_files.mk b/obj_files.mk
index 8974758..e20b308 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -1,12 +1,11 @@
-INIT_O_FILES := \
- $(BUILD_DIR)/asm/init.o
-
EXTAB_O_FILES := \
$(BUILD_DIR)/asm/extab.o
EXTABINDEX_O_FILES := \
$(BUILD_DIR)/asm/extabindex.o
+#init is included here so that linking is in the right order
+#todo fix with makefile implementation
TEXT_O_FILES := \
$(BUILD_DIR)/asm/text_1.o \
$(BUILD_DIR)/asm/text_2.o \
@@ -14,6 +13,9 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/text_4.o \
$(BUILD_DIR)/asm/text_5.o \
$(BUILD_DIR)/asm/text_6.o \
+ $(BUILD_DIR)/asm/libstdc++/__mem.o \
+ $(BUILD_DIR)/asm/init.o \
+ $(BUILD_DIR)/asm/text_6_2.o \
$(BUILD_DIR)/asm/text_7.o \
$(BUILD_DIR)/asm/SDK/OS/OS.o \
$(BUILD_DIR)/asm/SDK/OS/OSAlarm.o \
@@ -22,6 +24,8 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/SDK/OS/OSAudioSystem.o \
$(BUILD_DIR)/asm/SDK/OS/OSCache.o \
$(BUILD_DIR)/asm/SDK/OS/OSContext.o \
+ $(BUILD_DIR)/asm/SDK/OS/OSError.o \
+ $(BUILD_DIR)/asm/SDK/OS/OSExec.o \
$(BUILD_DIR)/asm/text_7_2.o \
$(BUILD_DIR)/asm/text_8.o \
$(BUILD_DIR)/asm/text_9.o \