summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authoremilybrooks <emilybrooksemilybrooks@gmail.com>2024-02-21 07:31:13 -0700
committerGitHub <noreply@github.com>2024-02-21 07:31:13 -0700
commita187e97a8a499437bc818356a1d62670772ab8b4 (patch)
tree95fbf4b8aa0a0276d3e914ca5d76c6c90aa3fdd6 /Makefile
parentc37305bb931ed27851978e394aed19ef395b2bee (diff)
Updated splat, implemented new palette system (#146)
* image_type_in_extension * new palette extension * global_id not found * updated splat * disaster * changed wording * fixed fall texture names * delete bin_to_inc_c script * forgot to rename
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 442c85d..8d8fa94 100644
--- a/Makefile
+++ b/Makefile
@@ -338,14 +338,10 @@ ifneq ($(PERMUTER), 1)
endif
# Build C files from assets
-$(BUILD_DIR)/%.bin: %.png
-# file names are formatted as <file name>.<image format>.png
+$(BUILD_DIR)/%.inc.c: %.png
+# File names are formatted as <file name>.<image format>.png
# The <image format> part is passed into pigment's format argument
- $(PIGMENT) to-bin -f $(subst .,,$(suffix $*)) -o $@ $<
-
-%.inc.c: %.bin
-# The C name argument uses just the <file name> part, with .<image format>.bin removed
- python3 tools/bin_inc_c.py $< $@ $(basename $(basename $(notdir $<)))
+ $(PIGMENT) to-bin -f $(subst .,,$(suffix $*)) --c-array -o $@ $<
# Add these as a dependency for .o files
asset_files: $(ASSET_INC_C)