many changes: Makefile, util, fixed indent, fixes in swapchain

[vkrt] / Makefile

diff --git a/Makefile b/Makefile
index 470cf95..0e3b0b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,32 @@
 src = $(wildcard src/*.c)
 obj = $(src:.c=.o)
 dep = $(obj:.o=.d)
+vsdr = $(wildcard data/*.vert)
+fsdr = $(wildcard data/*.frag)
+spv = $(subst .vert,.vert.spv,$(vsdr)) \
+         $(subst .frag,.frag.spv,$(fsdr))
 bin = rt
 
 dbg = -g
 
 CC = gcc
-CFLAGS = -pedantic -Wall $(dbg) $(pkg-config --cflags glfw3)
-LDFLAGS =  -lvulkan -lglfw #$(pkg-config --libs glfw3)
+CFLAGS = -pedantic -Wall $(dbg) -MMD
+LDFLAGS =  -lvulkan -lglfw
+
+.PHONY: all
+all: $(bin) $(spv)
 
 $(bin): $(obj)
        $(CC) -o $@ $(obj) $(LDFLAGS)
 
--include $(dep)
+%.vert.spv: %.vert
+       glslangValidator -V $< -o $@
 
-%.d: %.c
-       @$(CC) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+%.frag.spv: %.frag
+       glslangValidator -V $< -o $@
+
+-include $(dep)
 
 .PHONY: clean
 clean:
-       rm -f $(obj) $(bin) $(dep)
+       rm -f $(obj) $(bin) $(dep) $(spv)