Added easy extension of custom merge results. Example fib merge rules added. Code altered to make use of this new style

2015-02-23 12:32:29 +13:00
parent 375cdeb7da
commit 6d247f282f
13 changed files with 127 additions and 82 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-CC	    ?= clang
+CC	    := clang
 CFLAGS  += -g -Wall -Wextra
 LFLAGS  +=
 DEFINES := -DVT100 $(shell pkg-config --cflags sdl2)