X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=667dfe63ac35d76b0401c7b1f8126d4bf4b33738;hp=ae8e5700bdc50241e5a981f8d384281f7bd34730;hb=10dd7aacfe87f97e10d61dff343e00b9c03eac69;hpb=a879fc28a34e5d3faa8c0ab3cd1c4c4325afe802

diff --git a/Makefile b/Makefile
index ae8e570..667dfe6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,12 @@ UNAME  ?= $(shell uname)
 CYGWIN  = $(findstring CYGWIN,  $(UNAME))
 MINGW   = $(findstring MINGW32, $(UNAME))
 
-CC     ?= clang
-CFLAGS += -Wall -Wextra -Werror -I. -fno-strict-aliasing -fsigned-char $(OPTIONAL)
+CC      ?= clang
+# linker flags and optional additional libraries if required
+LDFLAGS :=
+LIBS    := -lm
+
+CFLAGS  += -Wall -Wextra -Werror -I. -fno-strict-aliasing -fsigned-char $(OPTIONAL)
 ifneq ($(shell git describe --always 2>/dev/null),)
     CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
 endif
@@ -25,8 +29,6 @@ ifeq ($(CC), clang)
 	    -Wno-conversion                    \
 	    -Wno-missing-prototypes            \
 	    -Wno-float-equal                   \
-	    -Wno-cast-align                    \
-	    -Wno-missing-variable-declarations \
 	    -Wno-unknown-warning-option
 else
 	#Tiny C Compiler doesn't know what -pedantic-errors is
@@ -169,22 +171,22 @@ SPLINTFLAGS =            \
 #standard rules
 default: all
 %.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS)
+	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
 
 exec-standalone.o: exec.c
-	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) -DQCVM_EXECUTOR=1
 
 $(QCVM): $(OBJ_X)
-	$(CC) -o $@ $^ $(CFLAGS) -lm
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(GMQCC): $(OBJ_C) $(OBJ_D)
-	$(CC) -o $@ $^ $(CFLAGS) -lm
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(TESTSUITE): $(OBJ_T)
-	$(CC) -o $@ $^ $(CFLAGS) -lm
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(PAK): $(OBJ_P)
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
 all: $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK)
 
@@ -194,7 +196,7 @@ test: all
 	@ ./$(TESTSUITE)
 
 clean:
-	rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4
+	rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe
 
 splint:
 	@  splint $(SPLINTFLAGS) *.c *.h
@@ -221,10 +223,10 @@ depend:
 install: install-gmqcc install-qcvm install-doc
 install-gmqcc: $(GMQCC)
 	install -d -m755               $(DESTDIR)$(BINDIR)
-	install    -m755  $(GMQCC)     $(DESTDIR)$(BINDIR)/gmqcc
+	install    -m755  $(GMQCC)     $(DESTDIR)$(BINDIR)/$(GMQCC)
 install-qcvm: $(QCVM)
 	install -d -m755               $(DESTDIR)$(BINDIR)
-	install    -m755  $(QCVM)      $(DESTDIR)$(BINDIR)/qcvm
+	install    -m755  $(QCVM)      $(DESTDIR)$(BINDIR)/$(QCVM)
 install-doc:
 	install -d -m755               $(DESTDIR)$(MANDIR)/man1
 	install    -m644  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/