]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Make it compile with g++ again
authorDale Weiler <killfieldengine@gmail.com>
Sun, 16 Jun 2013 05:59:41 +0000 (05:59 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 16 Jun 2013 05:59:41 +0000 (05:59 +0000)
Makefile

index 2e5c1eea8323b4cac1b55e9933f8d22014c7baa6..ba3a04909a71747d4cc93464c97d63d6b7c05756 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,15 @@ else
        #Tiny C Compiler doesn't know what -pedantic-errors is
        # and instead of ignoring .. just errors.
        ifneq ($(CC), tcc)
-               CFLAGS += -Wstrict-prototypes -pedantic-errors
+               CFLAGS += -pedantic-errors
        else
                CFLAGS += -Wno-pointer-sign -fno-common
        endif
+       
+       #-Wstrict-prototypes is not valid in g++
+       ifneq ($(CC), g++)
+               CFLAGS += -Wstrict-prototypes
+       endif
 endif
 
 ifeq ($(track), no)