Merge pull request #8 from besser82/improvements

Unified codebase
tiehuis · Dec 5, 2014 · a9505d9 · a9505d9
2 parents 2195f44 + 2efc3db
commit a9505d9
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 455 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /2048*
+*~
diff --git a/Makefile b/Makefile
@@ -4,11 +4,11 @@ LIBS	= -lcurses
 
 all: 2048
 
-2048: src/2048.c src/2048.h src/highscore_file.c
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) src/2048.c src/highscore_file.c -o 2048
+2048: src/2048.c
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) src/2048.c -o 2048
 
-2048nc: src/2048_no_curses.c src/2048.h src/highscore_file.c
-	$(CC) $(CFLAGS) $(LDFLAGS) src/2048_no_curses.c src/highscore_file.c -o 2048nc
+2048nc: src/2048.c
+	$(CC) -DNO_CURSES=1 $(CFLAGS) $(LDFLAGS) src/2048.c -o 2048nc
 
 clean:
 	rm -f 2048 2048nc