projects
/
vkrt
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for c++, mv main.c->main.cc
[vkrt]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0e3b0b4
..
70c5194
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)
@@
-10,14
+11,16
@@
bin = rt
dbg = -g
CC = gcc
dbg = -g
CC = gcc
+CXX = g++
CFLAGS = -pedantic -Wall $(dbg) -MMD
CFLAGS = -pedantic -Wall $(dbg) -MMD
+CXXFLAGS = -pedantic -Wall $(dbg) -MMD
LDFLAGS = -lvulkan -lglfw
.PHONY: all
all: $(bin) $(spv)
$(bin): $(obj)
LDFLAGS = -lvulkan -lglfw
.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 $@