ir_instr_delete_quick needs to clear _m_ops

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index fdc20a739b0b15ad96b173700c0d72fc127589eb..c6a6327ed02269a35d0146662a6edac6007ccbbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,84 +1,74 @@
-DESTDIR :=
-PREFIX := /usr/local
-BINDIR := $(PREFIX)/bin
-DATADIR := $(PREFIX)/share
-MANDIR := $(DATADIR)/man
-
-GMQCC_MAJOR=0
-GMQCC_MINOR=2
-GMQCC_PATCH=0
-
-CC     ?= clang
-CFLAGS += -Wall -Wextra -I. -pedantic-errors
-#turn on tons of warnings if clang is present
-ifeq ($(CC), clang)
-       CFLAGS +=                         \
-               -Weverything                  \
-               -Wno-padded                   \
-               -Wno-format-nonliteral        \
-               -Wno-disabled-macro-expansion \
-               -Wno-conversion               \
-               -Wno-missing-prototypes
-
-endif
-ifeq ($(track), no)
-    CFLAGS += -DNOTRACK
-endif
-
-OBJ     =             \
-          util.o      \
-          code.o      \
-          ast.o       \
-          ir.o        \
-          con.o       \
-          ftepp.o
-
-OBJ_T = test.o util.o con.o
-OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o con.o
-
-CFLAGS += -DGMQCC_VERSION_MAJOR=$(GMQCC_MAJOR)
-CFLAGS += -DGMQCC_VERSION_MINOR=$(GMQCC_MINOR)
-CFLAGS += -DGMQCC_VERSION_PATCH=$(GMQCC_PATCH)
-
-default: gmqcc
-%.o: %.c
-       $(CC) -c $< -o $@ $(CFLAGS)
-
-exec-standalone.o: exec.c
-       $(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
-
-qcvm: $(OBJ_X)
-       $(CC) -o $@ $^ $(CFLAGS) -lm
-
-gmqcc: $(OBJ_C) $(OBJ)
-       $(CC) -o $@ $^ $(CFLAGS)
-
-testsuite: $(OBJ_T)
-       $(CC) -o $@ $^ $(CFLAGS)
-
-all: gmqcc qcvm testsuite
-
-check: all
-       @ ./testsuite
+CXX ?= clang++
+CXXFLAGS = \
+       -std=c++11 \
+       -Wall \
+       -Wextra \
+       -fno-exceptions \
+       -fno-rtti \
+       -MD \
+       -g3
+
+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
+
+TSRCS = \
+       conout.cpp \
+       opts.cpp \
+       stat.cpp \
+       test.cpp \
+       util.cpp
+
+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) $(VBIN)
+
+$(CBIN): $(COBJS)
+       $(CXX) $(COBJS) -o $@
+
+$(TBIN): $(TOBJS)
+       $(CXX) $(TOBJS) -o $@
+
+$(VBIN): $(VOBJS)
+       $(CXX) $(VOBJS) -o $@
+
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $< -o $@
+
+test: $(CBIN) $(TBIN) $(VBIN)
+       @./$(TBIN)
 
 clean:
-       rm -f *.o gmqcc qcvm testsuite *.dat
-
-
-$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
-main.o: lexer.h
-parser.o: ast.h lexer.h
-ast.o: ast.h ir.h
-ir.o: ir.h
+       rm -f *.d
+       rm -f $(COBJS) $(CDEPS) $(CBIN)
+       rm -f $(TOBJS) $(TDEPS) $(TBIN)
+       rm -f $(VOBJS) $(VDEPS) $(VBIN)
 
-install: install-gmqcc install-qcvm install-doc
-install-gmqcc: gmqcc
-       install -d -m755               $(DESTDIR)$(BINDIR)
-       install    -m755  gmqcc        $(DESTDIR)$(BINDIR)/gmqcc
-install-qcvm: qcvm
-       install -d -m755               $(DESTDIR)$(BINDIR)
-       install    -m755  qcvm         $(DESTDIR)$(BINDIR)/qcvm
-install-doc:
-       install -d -m755               $(DESTDIR)$(MANDIR)/man1
-       install    -m755  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/
+-include *.d