From b7b8a0afe1eb4d3c36b642db2e385d27f8041739 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sun, 4 Jan 2026 12:25:49 +0100 Subject: [PATCH] cleanup of directory structure --- {maps => levels}/l1.inc | 0 makefile | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) rename {maps => levels}/l1.inc (100%) diff --git a/maps/l1.inc b/levels/l1.inc similarity index 100% rename from maps/l1.inc rename to levels/l1.inc diff --git a/makefile b/makefile index ba4cd84..60497e9 100644 --- a/makefile +++ b/makefile @@ -4,12 +4,13 @@ AS=ulas FLAGS=-D DEBUG #SYMTYPE=sym SYMTYPE=mlb +INCS=-I ./src -I ./tiles -I ./maps -I ./levels bin: - $(AS) $(FLAGS) -o $(NAME).gb -l ${NAME}.lst -s $(NAME).$(SYMTYPE) -S $(SYMTYPE) -I ./src -I ./tiles -I ./maps src/main.s + $(AS) $(FLAGS) -o $(NAME).gb -l ${NAME}.lst -s $(NAME).$(SYMTYPE) -S $(SYMTYPE) $(INCS) src/main.s test: - $(AS) $(FLAGS) -o $(TEST_NAME).gb -l ${TEST_NAME}.lst -s $(TEST_NAME).mlb -S mlb -I ./src -I ./tiles -I ./maps src/main.s + $(AS) $(FLAGS) -o $(TEST_NAME).gb -l ${TEST_NAME}.lst -s $(TEST_NAME).mlb -S mlb %(INCS) src/main.s .PHONY: tiles tiles: @@ -19,10 +20,9 @@ tiles: ./tools/png2chr.py assets/tiles/bank9000.png > tiles/bank9000.inc .PHONY: maps -maps: +maps: ./tools/tmx2map.py assets/maps/near_wall.tmx 1 > maps/near_wall.inc ./tools/tmx2map.py assets/maps/far_wall.tmx 1 > maps/far_wall.inc - ./tools/tmx2map.py assets/maps/l1.tmx > maps/l1.inc ./tools/tmx2map.py assets/maps/near_left_door.tmx 1 > maps/near_left_door.inc ./tools/tmx2map.py assets/maps/near_right_door.tmx 1 > maps/near_right_door.inc @@ -47,3 +47,7 @@ maps: ./tools/tmx2map.py assets/maps/near_right_center_wall.tmx 1 > maps/near_right_center_wall.inc ./tools/tmx2map.py assets/maps/near_left_center_wall.tmx 1 > maps/near_left_center_wall.inc + +.PHONY: levels +levels: + ./tools/tmx2map.py assets/levels/l1.tmx > levels/l1.inc -- 2.30.2