From cfe317dce9e69e2c9f9fc688c0174db989901068 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 9 Oct 2022 16:07:05 -0700 Subject: [PATCH] Actually link CCollisionSurface --- configure.py | 1 + obj_files.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.py b/configure.py index fa538a78..bb43e1f0 100755 --- a/configure.py +++ b/configure.py @@ -41,6 +41,7 @@ COMPLETE_OBJECTS = [ "MetroidPrime/ScriptObjects/CScriptPickup", "MetroidPrime/ScriptObjects/CScriptSwitch", "MetroidPrime/CIOWin", + "WorldFormat/CCollisionSurface", "Weapons/IWeaponRenderer", "Collision/CMaterialList", "Collision/CMaterialFilter", diff --git a/obj_files.mk b/obj_files.mk index 164ab068..2eef5269 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -359,7 +359,7 @@ METROIDPRIME :=\ WORLDFORMAT :=\ $(BUILD_DIR)/asm/WorldFormat/CAreaOctTree_Tests.o\ - $(BUILD_DIR)/asm/WorldFormat/CCollisionSurface.o\ + $(BUILD_DIR)/src/WorldFormat/CCollisionSurface.o\ $(BUILD_DIR)/asm/WorldFormat/CMetroidModelInstance.o\ $(BUILD_DIR)/asm/WorldFormat/CAreaBspTree.o\ $(BUILD_DIR)/asm/WorldFormat/CAreaOctTree.o\