X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=c6a6327ed02269a35d0146662a6edac6007ccbbc;hb=1826971301dae48a9920ea4e331205371c48cc6b;hp=473089ab9d4611ad1b65d94e8465ea5949695f16;hpb=a7724bffaa882fe9e62590d1f1017cd22d9ba536;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index 473089a..c6a6327 100644
--- a/Makefile
+++ b/Makefile
@@ -1,113 +1,74 @@
-DESTDIR :=
-PREFIX  := /usr/local
-BINDIR  := $(PREFIX)/bin
-DATADIR := $(PREFIX)/share
-MANDIR  := $(DATADIR)/man
+CXX ?= clang++
+CXXFLAGS = \
+	-std=c++11 \
+	-Wall \
+	-Wextra \
+	-fno-exceptions \
+	-fno-rtti \
+	-MD \
+	-g3
 
-UNAME  ?= $(shell uname)
-CYGWIN  = $(findstring CYGWIN,  $(UNAME))
-MINGW   = $(findstring MINGW32, $(UNAME))
+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
 
-CC     ?= clang
-CFLAGS += -Wall -Wextra -I. -pedantic-errors -fno-strict-aliasing -fsigned-char
-#turn on tons of warnings if clang is present
-# but also turn off the STUPID ONES
-ifeq ($(CC), clang)
-	CFLAGS +=                         \
-		-Weverything                  \
-		-Wno-padded                   \
-		-Wno-format-nonliteral        \
-		-Wno-disabled-macro-expansion \
-		-Wno-conversion               \
-		-Wno-missing-prototypes       \
-		-Wno-float-equal              \
-		-Wno-cast-align
-endif
-ifeq ($(track), no)
-    CFLAGS += -DNOTRACK
-endif
+TSRCS = \
+	conout.cpp \
+	opts.cpp \
+	stat.cpp \
+	test.cpp \
+	util.cpp
 
-OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o file.o utf8.o
-OBJ_T = test.o util.o conout.o file.o
-OBJ_C = main.o lexer.o parser.o file.o
-OBJ_X = exec-standalone.o util.o conout.o file.o
+VSRCS = \
+	exec.cpp \
+	stat.cpp \
+	util.cpp
 
-ifneq ("$(CYGWIN)", "")
-	#nullify the common variables that
-	#most *nix systems have (for windows)
-	PREFIX   :=
-	BINDIR   :=
-	DATADIR  :=
-	MANDIR   :=
-	QCVM      = qcvm.exe
-	GMQCC     = gmqcc.exe
-	TESTSUITE = testsuite.exe
-else
-ifneq ("$(MINGW)", "")
-	#nullify the common variables that
-	#most *nix systems have (for windows)
-	PREFIX   :=
-	BINDIR   :=
-	DATADIR  :=
-	MANDIR   :=
-	QCVM      = qcvm.exe
-	GMQCC     = gmqcc.exe
-	TESTSUITE = testsuite.exe
-else
-	#arm support for linux .. we need to allow unaligned accesses
-	#to memory otherwise we just segfault everywhere
-	ifneq (, $(findstring arm, $(shell uname -m)))
-		CFLAGS += -munaligned-access
-	endif
+COBJS = $(CSRCS:.cpp=.o)
+TOBJS = $(TSRCS:.cpp=.o)
+VOBJS = $(VSRCS:.cpp=.o)
 
-	QCVM      = qcvm
-	GMQCC     = gmqcc
-	TESTSUITE = testsuite
-endif
-endif
+CDEPS = $(CSRCS:.cpp=.d)
+TDEPS = $(TSRCS:.cpp=.d)
+VDEPS = $(VSRCS:.cpp=.d)
 
-#standard rules
-default: all
-%.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS)
+CBIN = gmqcc
+TBIN = testsuite
+VBIN = qcvm
 
-exec-standalone.o: exec.c
-	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+all: $(CBIN) $(TBIN) $(VBIN)
 
-$(QCVM): $(OBJ_X)
-	$(CC) -o $@ $^ $(CFLAGS) -lm
+$(CBIN): $(COBJS)
+	$(CXX) $(COBJS) -o $@
 
-$(GMQCC): $(OBJ_C) $(OBJ_D)
-	$(CC) -o $@ $^ $(CFLAGS)
+$(TBIN): $(TOBJS)
+	$(CXX) $(TOBJS) -o $@
 
-$(TESTSUITE): $(OBJ_T)
-	$(CC) -o $@ $^ $(CFLAGS)
+$(VBIN): $(VOBJS)
+	$(CXX) $(VOBJS) -o $@
 
-all: $(GMQCC) $(QCVM) $(TESTSUITE)
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $< -o $@
 
-check: all
-	@ ./$(TESTSUITE)
+test: $(CBIN) $(TBIN) $(VBIN)
+	@./$(TBIN)
 
 clean:
-	rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) *.dat
+	rm -f *.d
+	rm -f $(COBJS) $(CDEPS) $(CBIN)
+	rm -f $(TOBJS) $(TDEPS) $(TBIN)
+	rm -f $(VOBJS) $(VDEPS) $(VBIN)
 
-# deps
-$(OBJ_D) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
-main.o:   lexer.h
-parser.o: ast.h lexer.h
-lexer.o:  lexer.h
-ast.o:    ast.h ir.h
-ir.o:     ir.h
-
-#install rules
-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/
-	install    -m755  doc/qcvm.1   $(DESTDIR)$(MANDIR)/man1/
+-include *.d