From 087f6e99d6daab307730eba2ab7181eebac635eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <mail@agateau.com>
Date: Sun, 12 Aug 2018 16:14:43 +0200
Subject: [PATCH] Make it possible to use LibreSprite instead of Aseprite

---
 core/assets-src/Makefile | 17 ++++++++++-------
 doc/building.md          | 11 ++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/assets-src/Makefile b/core/assets-src/Makefile
index 54ec4e041..69bdffa8a 100644
--- a/core/assets-src/Makefile
+++ b/core/assets-src/Makefile
@@ -6,6 +6,9 @@ FINAL_OUT_DIR ?= ../../android/assets
 
 VEHICLES_SUBDIR := sprites/vehicles
 
+# Path to aseprite or libresprite
+ASEPRITE ?= aseprite
+
 all: hud anims stills vehicles tiles helicopter ui
 
 clean: clean-anims clean-stills clean-vehicles clean-tiles clean-helicopter clean-ui
@@ -16,7 +19,7 @@ hud: $(OUT_DIR)/sprites/hud-pause.png
 
 $(OUT_DIR)/sprites/hud-pause.png: sprites/hud/hud-pie-buttons.ase sprites/hud/hud.py
 	mkdir -p $(OUT_DIR)/sprites
-	aseprite --batch --split-layers --trim sprites/hud/hud-pie-buttons.ase \
+	$(ASEPRITE) --batch --split-layers --trim sprites/hud/hud-pie-buttons.ase \
 		--filename-format '{path}/hud-{layer}.{extension}' --save-as sprites/hud/whatever.png
 	sprites/hud/hud.py $(OUT_DIR)/sprites
 
@@ -27,7 +30,7 @@ stills: $(OUT_STILL_IMAGES)
 
 $(OUT_DIR)/sprites/%.png: sprites/%.still.ase
 	mkdir -p $(OUT_DIR)/sprites
-	aseprite --batch $< --save-as $@
+	$(ASEPRITE) --batch $< --save-as $@
 
 clean-stills:
 	rm -f $(OUT_STILL_IMAGES)
@@ -43,14 +46,14 @@ clean-anims:
 
 $(OUT_DIR)/sprites/%_0.png: sprites/%.anim.ase
 	mkdir -p $(OUT_DIR)/sprites
-	aseprite --batch $< --filename-format '{path}/{title}_{frame}.{extension}' --save-as $(patsubst %_0.png,%.png,$@)
+	$(ASEPRITE) --batch $< --filename-format '{path}/{title}_{frame}.{extension}' --save-as $(patsubst %_0.png,%.png,$@)
 
 #- Helicopter -----------------------------------------------------------------
 helicopter: $(OUT_DIR)/sprites/helicopter-body.png
 
 $(OUT_DIR)/sprites/helicopter-body.png: sprites/helicopter.ase
 	mkdir -p $(OUT_DIR)/sprites
-	aseprite --batch --split-layers --trim $< --filename-format '{path}/helicopter-{layer}.{extension}' --save-as $@
+	$(ASEPRITE) --batch --split-layers --trim $< --filename-format '{path}/helicopter-{layer}.{extension}' --save-as $@
 
 clean-helicopter:
 	rm -f $(OUT_DIR)/sprites/helicopter-*.png
@@ -64,7 +67,7 @@ vehicles: $(OUT_VEHICLE_IMAGES)
 $(OUT_DIR)/sprites/vehicles/%.png: TMP_PNG = $(@:%.png=%-tmp.png)
 $(OUT_DIR)/sprites/vehicles/%.png: sprites/vehicles/%.ase
 	mkdir -p $(OUT_DIR)/sprites/vehicles
-	aseprite --batch $< --save-as $(TMP_PNG)
+	$(ASEPRITE) --batch $< --save-as $(TMP_PNG)
 	convert -rotate 90 $(TMP_PNG) $@
 	rm $(TMP_PNG)
 
@@ -80,7 +83,7 @@ tiles: $(OUT_TILE_IMAGES)
 $(FINAL_OUT_DIR)/maps/%.png: TMP_PNG = $(@:%.png=%-tmp.png)
 $(FINAL_OUT_DIR)/maps/%.png: maps/%.ase
 	mkdir -p $(FINAL_OUT_DIR)/maps
-	aseprite --batch $< --save-as $(TMP_PNG)
+	$(ASEPRITE) --batch $< --save-as $(TMP_PNG)
 	convert -alpha set -channel RGBA \
 		-fill '#22203460' -opaque '#ff00ff' \
 		-fill '#ffffff20' -opaque '#00ffff' \
@@ -98,7 +101,7 @@ ui: $(OUT_UI_IMAGES)
 
 $(OUT_DIR)/ui/%.png: ui/%.ase
 	mkdir -p $(OUT_DIR)/ui
-	aseprite --batch $< --save-as $@
+	$(ASEPRITE) --batch $< --save-as $@
 
 clean-ui:
 	rm -f $(OUT_UI_IMAGES)
diff --git a/doc/building.md b/doc/building.md
index eb172f6c8..1f3017712 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -6,9 +6,9 @@ Building Pixel Wheels requires the following components:
 
 - A JDK
 - libgdx: <https://libgdx.badlogicgames.com>
-- pafx: <https://github.com/agateau/pafx>
-- aseprite: <https://aseprite.org>
-- imagemagick: <http://imagemagick.org>
+- PAFX: <https://github.com/agateau/pafx>
+- Aseprite: <https://aseprite.org> (or LibreSprite <https://github.com/LibreSprite/LibreSprite>)
+- ImageMagick: <http://imagemagick.org>
 - GNU Make: <http://www.gnu.org/software/make/>
 
 ## Assets
@@ -17,6 +17,11 @@ Some assets must be generated from work files with:
 
     make assets
 
+If you want to use LibreSprite instead of Aseprite, generate the assets with
+this command instead:
+
+    make assets ASEPRITE=/path/to/libresprite
+
 ## Map screenshots
 
 The map screenshots are generated using the MapScreenshotGenerator tool, which