gitignore: add gmqcc, gmqpak, qmcvm, testsuite, pak.

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 8f4fb9682c924f292b947302becec9d9acc31ca8..35b825a1f917a9d0a74898471f54c2a4d2db1d54 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@ MINGW   = $(findstring MINGW32, $(UNAME))
 
 CC      ?= clang
 # linker flags and optional additional libraries if required
-LDFLAGS :=
-LIBS    :=
+LDFLAGS +=
+LIBS    += -lm
 
-CFLAGS  += -Wall -Wextra -Werror -I. -fno-strict-aliasing -fsigned-char $(OPTIONAL)
+CFLAGS  += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL)
 ifneq ($(shell git describe --always 2>/dev/null),)
     CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
 endif
@@ -29,14 +29,12 @@ 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
        # and instead of ignoring .. just errors.
        ifneq ($(CC), tcc)
-               CFLAGS +=-pedantic-errors -ffunction-sections -fdata-sections -Wl,-gc-sections
+               CFLAGS += -pedantic-errors
        else
                CFLAGS += -Wno-pointer-sign -fno-common
        endif
@@ -76,12 +74,6 @@ ifneq ("$(MINGW)", "")
        TESTSUITE = testsuite.exe
        PAK       = pak.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
-
        QCVM      = qcvm
        GMQCC     = gmqcc
        TESTSUITE = testsuite
@@ -179,13 +171,13 @@ exec-standalone.o: exec.c
        $(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) -DQCVM_EXECUTOR=1
 
 $(QCVM): $(OBJ_X)
-       $(CC) -o $@ $^ $(LDFLAGS) -lm $(LIBS)
+       $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(GMQCC): $(OBJ_C) $(OBJ_D)
-       $(CC) -o $@ $^ $(LDFLAGS) -lm $(LIBS)
+       $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(TESTSUITE): $(OBJ_T)
-       $(CC) -o $@ $^ $(LDFLAGS) -lm $(LIBS)
+       $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(PAK): $(OBJ_P)
        $(CC) -o $@ $^ $(LDFLAGS)
@@ -198,7 +190,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