From b293168cc158d65f1a5146f155921ff82119d1bc Mon Sep 17 00:00:00 2001
From: quou <quou@disroot.org>
Date: Mon, 23 Dec 2024 14:41:01 +1100
Subject: Texture conversion and loading

---
 Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1d01b16..f8ecd68 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,9 @@
 target = c2
 data_dir = data
 shaders = $(data_dir)/triangle.csh
-packed_files = $(shaders)
-tools = qstd cfg sc packer
+textures = $(data_dir)/22.tex
+packed_files = $(shaders) $(textures)
+tools = qstd cfg sc
 objects = app.o c2.o video.o pipeline.o asset.o
 includes = -Iqstd
 defines = -Dplat_x86 -Dplat_posix -Dplat_x11 -Dallocation_default_alignment=8
@@ -13,7 +14,7 @@ libs = -lX11 -lm
 lflags = $(libs) $(DEBUG_LINK_FLAG)
 
 .PHONY: all clean $(tools)
-all: $(target) $(shaders) $(tools) $(objects)
+all: $(target) $(shaders) $(tools) $(objects) pack
 
 qstd:
 	$(MAKE) -C qstd
@@ -27,12 +28,18 @@ sc: qstd cfg
 packer: packer.c | qstd
 	$(CC) $(cflags) packer.c $(lflags) -Lqstd -lqstd -o packer
 
+convtexture: convtexture.c | qstd
+	$(CC) $(cflags) convtexture.c $(lflags) -Lqstd -lqstd -o convtexture
+
 pack: $(packed_files) packer
 	./packer pack $(data_dir) $(packed_files)
 
 data/triangle.csh: intermediate/triangle.glsl | $(data_dir) sc
 	./sc/sc intermediate/triangle.glsl $(data_dir)/triangle.csh
 
+data/22.tex: intermediate/22.bmp | $(data_dir) convtexture
+	./convtexture intermediate/22.bmp $(data_dir)/22.tex bc1
+
 app.o:
 	$(CXX) -c $(cflags) app.cpp -o app.o
 
-- 
cgit v1.2.3-54-g00ecf