projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the if for GCC 4 to an elseif so it does not interfere with MacOS
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 5eab9d5288aa42ba0442dd19df776aa592b6f3b6..22f1370edf6665e0db8547cdb0cf35b80751f9cf 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,14
+1,22
@@
# Makefile for the open-source release of adventure 2.5
LIBS=-lrt
# Makefile for the open-source release of adventure 2.5
LIBS=-lrt
+UNAME_S := $(shell uname -s)
+GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
+ifeq ($(UNAME_S),Darwin)
+ LIBS=
+else ifeq "$(GCCVERSIONGTEQ4)" "1"
+ CC=c99 --std=gnu99
+endif
+
OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
.c.o:
OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
.c.o:
-
gcc
-O $(DBX) -c $<
+
$(CC)
-O $(DBX) -c $<
advent: $(OBJS)
advent: $(OBJS)
-
gcc
-Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+
$(CC)
-Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
main.o: main.h misc.h funcs.h database.h
main.o: main.h misc.h funcs.h database.h
@@
-24,10
+32,10
@@
misc.o: misc.h main.h database.h
database.c database.h: compile
./compile
database.c database.h: compile
./compile
-
gcc
$(OPTIONS) -O $(DBX) -c database.c
+
$(CC)
$(OPTIONS) -O $(DBX) -c database.c
clean:
clean:
- rm -f *.o advent advent.html advent.6 database.[ch]
+ rm -f *.o advent advent.html advent.6 database.[ch]
compile
cd tests; $(MAKE) --quiet clean
check: advent
cd tests; $(MAKE) --quiet clean
check: advent
@@
-50,6
+58,3
@@
release: advent-$(VERS).tar.gz advent.html
refresh: advent.html
shipper -N -w version=$(VERS) | sh -e -x
refresh: advent.html
shipper -N -w version=$(VERS) | sh -e -x
-
-database:
- cd database; $(MAKE)