X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=c6a6327ed02269a35d0146662a6edac6007ccbbc;hp=145c4a79d754b9504ada108c8529d2913e1ba96d;hb=1826971301dae48a9920ea4e331205371c48cc6b;hpb=e452c176b40e8f9e2ccb833986c0c01fe69bcfa0

diff --git a/Makefile b/Makefile
index 145c4a7..c6a6327 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,74 @@
-CC ?= clang
-CFLAGS = -MD -Wall -Wextra -pedantic-errors
-LDFLAGS = -lm
+CXX ?= clang++
+CXXFLAGS = \
+	-std=c++11 \
+	-Wall \
+	-Wextra \
+	-fno-exceptions \
+	-fno-rtti \
+	-MD \
+	-g3
 
-CSRCS = ansi.c ast.c code.c conout.c fold.c fs.c ftepp.c hash.c intrin.c ir.c lexer.c main.c opts.c parser.c stat.c utf8.c util.c
-TSRCS = ansi.c conout.c fs.c hash.c opts.c stat.c test.c util.c
+CSRCS = \
+	ast.cpp \
+	code.cpp \
+	conout.cpp \
+	fold.cpp \
+	ftepp.cpp \
+	intrin.cpp \
+	ir.cpp \
+	lexer.cpp \
+	main.cpp \
+	opts.cpp \
+	parser.cpp \
+	stat.cpp \
+	utf8.cpp \
+	util.cpp
 
-COBJS = $(CSRCS:.c=.o)
-TOBJS = $(TSRCS:.c=.o)
+TSRCS = \
+	conout.cpp \
+	opts.cpp \
+	stat.cpp \
+	test.cpp \
+	util.cpp
 
-CDEPS = $(CSRCS:.c=.d)
-TDEPS = $(TSRCS:.c=.d)
+VSRCS = \
+	exec.cpp \
+	stat.cpp \
+	util.cpp
+
+COBJS = $(CSRCS:.cpp=.o)
+TOBJS = $(TSRCS:.cpp=.o)
+VOBJS = $(VSRCS:.cpp=.o)
+
+CDEPS = $(CSRCS:.cpp=.d)
+TDEPS = $(TSRCS:.cpp=.d)
+VDEPS = $(VSRCS:.cpp=.d)
 
 CBIN = gmqcc
 TBIN = testsuite
+VBIN = qcvm
 
-all: $(CBIN) $(TBIN)
+all: $(CBIN) $(TBIN) $(VBIN)
 
 $(CBIN): $(COBJS)
-	$(CC) $(LDFLAGS) $(COBJS) -o $@
+	$(CXX) $(COBJS) -o $@
 
 $(TBIN): $(TOBJS)
-	$(CC) $(LDFLAGS) $(TOBJS) -o $@
+	$(CXX) $(TOBJS) -o $@
 
-.c.o:
-	$(CC) -c $(CFLAGS) $< -o $@
+$(VBIN): $(VOBJS)
+	$(CXX) $(VOBJS) -o $@
 
-test: $(CBIN) $(TBIN)
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+
+test: $(CBIN) $(TBIN) $(VBIN)
 	@./$(TBIN)
 
 clean:
 	rm -f *.d
 	rm -f $(COBJS) $(CDEPS) $(CBIN)
 	rm -f $(TOBJS) $(TDEPS) $(TBIN)
+	rm -f $(VOBJS) $(VDEPS) $(VBIN)
+
+-include *.d