From c70f12618fd07ef6c453aaa2be3b6e495f41b6c3 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 2 Sep 2024 17:50:33 +1200 Subject: [PATCH] tidy makefile --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 764c523..9381d9e 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ endif .PHONY: shaders resources run clean bear -$(BINARY): $(SHADER_OBJ) $(RESOUCES_OBJ) $(RESOURCES_H) $(C_OBJ) $(OBJC_OBJ) +$(BINARY): $(SHADER_OBJ) $(RESOURCES_H) $(C_OBJ) $(OBJC_OBJ) $(CC) $(C_OBJ) $(OBJC_OBJ) $(RESOURCES_OBJ) $(LDFLAGS) -o $(BINARY) shaders: $(SHADER_OBJ) @@ -51,9 +51,11 @@ shaders: $(SHADER_OBJ) resources: $(RESOURCES_OBJ) $(RESOURCES_H) @echo "Resources compiled" -$(RESOURCES_OBJ): $(RESOURCES_C) $(RESOURCE_FILES) +$(RESOURCES_C): @echo "// Generated resource file" > $(RESOURCES_C) $(foreach res, $(RESOURCE_FILES), xxd -i $(res) >> $(RESOURCES_C);) + +$(RESOURCES_OBJ): $(RESOURCES_C) $(RESOURCE_FILES) $(CC) -o $@ -c $(RESOURCES_C) $(RESOURCES_H): $(RESOURCES_OBJ) @@ -80,4 +82,4 @@ bear: clean bear -- $(MAKE) $(BINARY) clean: - rm -rf $(C_OBJ) $(OBJC_OBJ) $(SHADER_OBJ) $(RESOURCES_OBJ) $(RESOURCES_H) $(BINARY) + rm -rf $(C_OBJ) $(OBJC_OBJ) $(SHADER_OBJ) $(RESOURCES_OBJ) $(RESOURCES_C) $(RESOURCES_H) $(BINARY)