projects
/
vkrt
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added a camera class and created a camera that I am not using yet :p
[vkrt]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0e3b0b4
..
63fe0e1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,6
@@
src = $(wildcard src/*.c)
src = $(wildcard src/*.c)
-obj = $(src:.c=.o)
+ccsrc = $(wildcard src/*.cc)
+obj = $(src:.c=.o) $(ccsrc:.cc=.o)
dep = $(obj:.o=.d)
vsdr = $(wildcard data/*.vert)
fsdr = $(wildcard data/*.frag)
dep = $(obj:.o=.d)
vsdr = $(wildcard data/*.vert)
fsdr = $(wildcard data/*.frag)
@@
-8,16
+9,19
@@
spv = $(subst .vert,.vert.spv,$(vsdr)) \
bin = rt
dbg = -g
bin = rt
dbg = -g
+inc = -Isubmodule/gmath/src -I/usr/include -Isubmodule/libimago/src -I/usr/local/include
CC = gcc
CC = gcc
+CXX = g++
CFLAGS = -pedantic -Wall $(dbg) -MMD
CFLAGS = -pedantic -Wall $(dbg) -MMD
-LDFLAGS = -lvulkan -lglfw
+CXXFLAGS = -pedantic -Wall $(dbg) -MMD $(opt) $(inc)
+LDFLAGS = -lvulkan -lglfw -lassimp -limago -lgmath
.PHONY: all
all: $(bin) $(spv)
$(bin): $(obj)
.PHONY: all
all: $(bin) $(spv)
$(bin): $(obj)
- $(CC) -o $@ $(obj) $(LDFLAGS)
+ $(CXX) -o $@ $(obj) $(LDFLAGS)
%.vert.spv: %.vert
glslangValidator -V $< -o $@
%.vert.spv: %.vert
glslangValidator -V $< -o $@