From 756bdec1d85d945345fa46e19d789e69e5d4eac3 Mon Sep 17 00:00:00 2001 From: Nikolai Lifanov Date: Wed, 31 May 2017 13:20:18 -0400 Subject: [PATCH] get rid of switching CC to c99 entirely Specifying -std=c99 is sufficient. Tested with: clang 4.0.0, clang 3.8.0, gcc 5.4.0, gcc 4.2.1 --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 06857bf..e2f5ddc 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,11 @@ # Makefile for the open-source release of adventure 2.5 +CC?=gcc CCFLAGS=-std=c99 LIBS= UNAME_S := $(shell uname -s) -GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4) ifeq ($(UNAME_S),Linux) LIBS=-lrt -else ifeq "$(GCCVERSIONGTEQ4)" "1" - CC?=c99 endif OBJS=main.o init.o actions1.o actions2.o score.o misc.o