From 86d5a546b4eab47b991a0acc4ab444c725feb081 Mon Sep 17 00:00:00 2001
From: quou <quou@disroot.org>
Date: Sun, 25 Aug 2024 15:38:49 +1000
Subject: GLTF meshes

---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b80e512..d5c8166 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,8 @@ sources = \
 objects = $(sources:%.c=%.o)
 
 mesh_sources = \
-	$(int_dir)/cube.obj \
-	$(int_dir)/gun.obj \
-	$(int_dir)/monkey.obj
+	$(int_dir)/gun.glb \
+	$(int_dir)/guy.glb
 
 texture_sources = \
 	$(int_dir)/brick.bmp \
@@ -41,7 +40,7 @@ texture_sources = \
 	$(int_dir)/gun.bmp \
 	$(int_dir)/guy.bmp
 
-meshes = $(mesh_sources:$(int_dir)/%.obj=$(data_dir)/%.msh)
+meshes = $(mesh_sources:$(int_dir)/%.glb=$(data_dir)/%.msh)
 textures = $(texture_sources:$(int_dir)/%.bmp=$(data_dir)/%.bc1)
 
 all: $(target) $(pack)
@@ -52,14 +51,14 @@ $(objects): %.o : %.c
 $(target): $(objects)
 	$(linker) $(objects) -o $@ $(lflags)
 
-$(meshes): $(data_dir)/%.msh : $(int_dir)/%.obj | $(convmesh) $(data_dir)
+$(meshes): $(data_dir)/%.msh : $(int_dir)/%.glb | $(convmesh) $(data_dir)
 	./$(convmesh) $< $@
 
 $(textures): $(data_dir)/%.bc1 : $(int_dir)/%.bmp | $(convtexture) $(data_dir)
 	./$(convtexture) $< $@
 
 $(convmesh): convmesh.c
-	$(tool_compiler) $(cflags) -o $@ $<
+	$(tool_compiler) -o $@ $<
 
 $(convtexture): convtexture.c
 	$(tool_compiler) $(cflags) -o $@ $< -lm
-- 
cgit v1.2.3-54-g00ecf