modified makefile for conways game of life

This commit is contained in:
Steffen Vogel 2010-11-30 13:25:02 +01:00
parent f6316ed56c
commit fea108eff5
3 changed files with 11 additions and 15 deletions

View File

@ -6,6 +6,9 @@ VPATH = src/
all: $(PROGS)
conway: src/conway.c
$(CC) $(CFLAGS) -std=gnu99 src/conway.c -o bin/conway -lcurses
%: src/%.c
$(CC) $(CFLAGS) $< -o bin/$@

Binary file not shown.

View File

@ -3,6 +3,7 @@
/* declarations */
int sum(int n);
int sum2(int n);
int fib(int n);
int main() {
@ -10,7 +11,7 @@ int main() {
printf("Please enter n: ");
scanf("%d", &n);
printf("fib(%d) = %d\nsum(%d) = %d\n", n, fib(n), n, sum(n));
printf("fib(%d) = %d\nsum(%d) = %d\n", n, fib(n), n, sum2(n));
return 0;
}
@ -25,19 +26,11 @@ int sum(int n) {
return sum;
}
int fib(int n) {
if (n >= 2) {
return fib(n-1) + fib(n-1);
}
else if (n == 1) {
return 1;
}
else if (n == 0) {
return 0;
}
else {
fprintf(stderr, "Invalid parameter: %d", n);
exit(-1);
}
int sum2(int n) {
return (n > 1) ? sum2(n-1) + n : 1;
}
int fib(int n) {
return (n < 2) ? n : fib(n-1) + fib(n-2);
}