From d189feb67d8ff6c50349fa6e4161c7242c33e59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 22 Oct 2022 08:00:41 +0100 Subject: [PATCH] merge namespace ostop --- asm/src/{Actor_801d98a4.s => ostop/Actor.s} | 0 asm/src/{Manager_801d9ba4.s => ostop/Manager.s} | 0 asm/src/{ReqHandle_801da2dc.s => ostop/ReqHandle.s} | 0 obj_files.mk | 7 ++++--- 4 files changed, 4 insertions(+), 3 deletions(-) rename asm/src/{Actor_801d98a4.s => ostop/Actor.s} (100%) rename asm/src/{Manager_801d9ba4.s => ostop/Manager.s} (100%) rename asm/src/{ReqHandle_801da2dc.s => ostop/ReqHandle.s} (100%) diff --git a/asm/src/Actor_801d98a4.s b/asm/src/ostop/Actor.s similarity index 100% rename from asm/src/Actor_801d98a4.s rename to asm/src/ostop/Actor.s diff --git a/asm/src/Manager_801d9ba4.s b/asm/src/ostop/Manager.s similarity index 100% rename from asm/src/Manager_801d9ba4.s rename to asm/src/ostop/Manager.s diff --git a/asm/src/ReqHandle_801da2dc.s b/asm/src/ostop/ReqHandle.s similarity index 100% rename from asm/src/ReqHandle_801da2dc.s rename to asm/src/ostop/ReqHandle.s diff --git a/obj_files.mk b/obj_files.mk index 6f86f30d..1e62f66c 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1005,11 +1005,12 @@ $(BUILD_DIR)/asm/src/ocoll/SearchHitNode.o \ $(BUILD_DIR)/asm/src/ocoll/SearchHitResult.o \ $(BUILD_DIR)/asm/src/ocoll/Shape.o \ \ +$(BUILD_DIR)/asm/src/ostop/Actor.o \ +$(BUILD_DIR)/asm/src/ostop/Manager.o \ +$(BUILD_DIR)/asm/src/ostop/ReqHandle.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/src/Actor_801d98a4.o \ -$(BUILD_DIR)/asm/src/Manager_801d9ba4.o \ -$(BUILD_DIR)/asm/src/ReqHandle_801da2dc.o \ $(BUILD_DIR)/asm/src/JITParam_801da2fc.o \ $(BUILD_DIR)/asm/src/ParamAccessor_801da3fc.o \ $(BUILD_DIR)/asm/src/ButtonPanel_801da574.o \