From 6a15de3443edf87795fb44eb9f40caecb40c1f13 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sun, 20 Feb 2022 20:23:10 -0800
Subject: [PATCH] Fix compile issues for Linux/Mac

---
 Makefile.split                     | 4 ++--
 autogen/convert_structs.py         | 3 ++-
 src/pc/lua/smlua_cobject_autogen.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.split b/Makefile.split
index 0ed8241c..1367f3d1 100644
--- a/Makefile.split
+++ b/Makefile.split
@@ -128,8 +128,8 @@ $(BUILD_DIR)/actors/group16.o: $(addprefix $(BUILD_DIR)/,$(CHILLYCHIEF_FILES)) $
 $(BUILD_DIR)/actors/group17.o: $(addprefix $(BUILD_DIR)/,$(MR_I_SWOOP_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MR_I_DIRS)),$(wildcard $(dir)/*.c))
 $(BUILD_DIR)/actors/common0.o: $(addprefix $(BUILD_DIR)/,$(AMP_CHUCKYA_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(AMP_DIRS)),$(wildcard $(dir)/*.c))
 $(BUILD_DIR)/actors/common1.o: $(addprefix $(BUILD_DIR)/,$(COINS_PIPE_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(COINS_DIRS)),$(wildcard $(dir)/*.c))
-$(BUILD_DIR)/actors/custom0.o: $(addprefix $(BUILD_DIR)/,$(CUSTOM_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CUSTOM_DIRS)),$(wildcard $(dir)/*.c))
-$(BUILD_DIR)/actors/zcustom0.o: $(addprefix $(BUILD_DIR)/,$(ZCUSTOM_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(ZCUSTOM_DIRS)),$(wildcard $(dir)/*.c))
+$(BUILD_DIR)/actors/custom0.o: | $(BUILD_DIR)/actors/common1.o $(addprefix $(BUILD_DIR)/,$(CUSTOM_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CUSTOM_DIRS)),$(wildcard $(dir)/*.c))
+$(BUILD_DIR)/actors/zcustom0.o:| $(BUILD_DIR)/actors/group0.o $(addprefix $(BUILD_DIR)/,$(ZCUSTOM_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(ZCUSTOM_DIRS)),$(wildcard $(dir)/*.c))
 
 # Actor Elf Files
 $(BUILD_DIR)/actors/group0.elf: SEGMENT_ADDRESS := 0x04000000
diff --git a/autogen/convert_structs.py b/autogen/convert_structs.py
index 89f84ba9..15f4647a 100644
--- a/autogen/convert_structs.py
+++ b/autogen/convert_structs.py
@@ -22,7 +22,8 @@ docs_lua_structs = 'docs/lua/structs.md'
 c_template = """/* THIS FILE IS AUTOGENERATED */
 /* SHOULD NOT BE MANUALLY CHANGED */
 $[INCLUDES]
-#include "include\object_fields.h"
+#include "include/object_fields.h"
+
 $[BODY]
 struct LuaObjectField* smlua_get_object_field_autogen(u16 lot, const char* key) {
     struct LuaObjectTable* ot = &sLuaObjectAutogenTable[lot - LOT_AUTOGEN_MIN - 1];
diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c
index b18c8151..1ad739b8 100644
--- a/src/pc/lua/smlua_cobject_autogen.c
+++ b/src/pc/lua/smlua_cobject_autogen.c
@@ -10,7 +10,7 @@
 #include "src/pc/djui/djui_hud_utils.h"
 #include "src/game/object_helpers.h"
 
-#include "include\object_fields.h"
+#include "include/object_fields.h"
 #define LUA_ANIM_INFO_FIELD_COUNT 11
 static struct LuaObjectField sAnimInfoFields[LUA_ANIM_INFO_FIELD_COUNT] = {
     { "animAccel",              LVT_S32,       offsetof(struct AnimInfo, animAccel),              false, LOT_NONE      },