archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of switching CC to c99 entirely

Browse source 
Specifying -std=c99 is sufficient. Tested with:
clang 4.0.0, clang 3.8.0, gcc 5.4.0, gcc 4.2.1
This commit is contained in:
Nikolai Lifanov 2017-05-31 13:20:18 -04:00
parent c9a14d1c38
commit 756bdec1d8
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -1,13 +1,11 @@
# Makefile for the open-source release of adventure 2.5 # Makefile for the open-source release of adventure 2.5
CC?=gcc
CCFLAGS=-std=c99 CCFLAGS=-std=c99
LIBS= LIBS=
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
LIBS=-lrt LIBS=-lrt
else ifeq "$(GCCVERSIONGTEQ4)" "1"
CC?=c99
endif endif
OBJS=main.o init.o actions1.o actions2.o score.o misc.o OBJS=main.o init.o actions1.o actions2.o score.o misc.o