1 files changed, 23 insertions, 11 deletions
diff --git a/light-client/makefile b/light-client/makefile
index 39199caa..4f900412 100644
--- a/light-client/makefile
+++ b/light-client/makefile
@@ -1,21 +1,33 @@
 
-ALL_TA = $(shell find textures/tiles -name '*.ta')
-ALL_PNG = $(shell find textures/tiles -name '*.png')
-ALL_TA_IMPORT = $(patsubst %.import.png,%.ta,$(shell find textures/tiles -name '*.import.png'))
-ALL_PNG_EXPORT = $(patsubst %.ta,%.png,$(ALL_TA))
+SPRITES = $(shell find assets/sprites -name '*.ta')
+SPRITES_PNG = $(patsubst %.ta,%.png,$(SPRITES))
+
+TEXTURES = $(shell find assets/textures -name '*.ta')
+TEXTURES_PNG = $(patsubst %.ta,%.png,$(TEXTURES))
+TEXTURES_IMPORT_PNG = $(patsubst %.import.png,%.ta,$(shell find assets/textures -name '*.import.png'))
+
+PNG = $(shell find assets/textures -name '*.png')
 
 .PHONY: tex_pack tex_export tex_import clean
-tex_pack: textures/atlas.ta
-tex_import: $(ALL_TA_IMPORT)
-tex_export: $(ALL_PNG_EXPORT)
+tex_pack: assets/atlas.ta
+tex_import: $(TEXTURES_IMPORT_PNG)
+tex_export: $(TEXTURES_PNG) $(SPRITES_PNG) assets/atlas.png
 clean:
-	rm -f $(ALL_PNG) 
-	rm -f textures/atlas.ta textures/atlas.meta.csv
+	rm -f $(PNG)
+	rm -f $(SPRITES)
+	rm -f assets/atlas.ta assets/atlas.meta.csv
 
 %.ta: %.import.png
 	../target/release/tex_import $< $@
 %.png: %.ta
 	../target/release/tex_export $< $@
 
-textures/atlas.ta textures/atlas.meta.csv: $(ALL_TA)
-	../target/release/tex_pack textures/atlas.ta textures/atlas.meta.csv $^
+assets/sprites/items/all: assets/items.ini $(TEXTURES)
+	@mkdir -p assets/sprites/items
+	../target/release/tex_compose $< assets/textures assets/sprites/items
+assets/sprites/tiles/all: assets/tiles.ini $(TEXTURES)
+	@mkdir -p assets/sprites/tiles
+	../target/release/tex_compose $< assets/textures assets/sprites/tiles
+
+assets/atlas.ta assets/atlas.meta.csv: assets/sprites/items/all assets/sprites/tiles/all
+	../target/release/tex_pack assets/atlas.ta assets/atlas.meta.csv $(SPRITES)