X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Recipe;h=3b57ef5e5413f7c5ffd2a8f6fa20b505ad6aaf9f;hb=a0a581c8b5422bf0c5ed3fde6aa25811e4eb89fc;hp=69edccfec2ecbdd2ebd011e34ceb6f00b546fd11;hpb=1ee9f5f2ef37f372d336d062326906993b6e62e5;p=sgt-puzzles.git

diff --git a/Recipe b/Recipe
index 69edccf..3b57ef5 100644
--- a/Recipe
+++ b/Recipe
@@ -17,6 +17,7 @@
 !makefile gnustep Makefile.gnustep
 !makefile nestedvm Makefile.nestedvm
 !makefile emcc Makefile.emcc
+!makefile clangcl Makefile.clangcl
 
 !srcdir icons/
 
@@ -93,106 +94,12 @@ Puzzles.dmg: Puzzles
 	rm -f raw.dmg devicename
 !end
 
-# Version management.
-!begin vc
-version.obj: *.c *.h
-	cl $(VER) $(CFLAGS) /c version.c
-!end
-!specialobj vc version
-!begin wce
-version.obj: *.c *.h
-	$(CC) $(VER) $(CFLAGS) /c version.c
-!end
-!specialobj wce version
-!begin cygwin
-version.o: FORCE;
-FORCE:
-	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c
-!end
-!specialobj cygwin version
-# For Unix, we also need the gross MD5 hack that causes automatic
-# version number selection in release source archives.
-!begin gtk
-version.o: version.c version2.def
-	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
-version2.def: FORCE
-	if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
-		cat version.def > version2.def.new; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		echo "-DREVISION=`svnversion .`" >version2.def.new; \
-	else \
-		echo "$(VER)" >version2.def.new; \
-	fi && \
-	if diff -q version2.def.new version2.def; then \
-		rm version2.def.new; \
-	else \
-		mv version2.def.new version2.def; \
-	fi
-.PHONY: FORCE
-!end
-!specialobj gtk version
-# In the automake build, we have to do the whole job by supplying
-# extra CFLAGS, so we have to put the if statement inside one big
-# backtick expression. We also force rebuilding via a -D option that
-# makes version.o include empty.h, which we construct ourselves and
-# touch whenever any source file is updated.
-!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir) && test -f manifest && md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/version.def; elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then echo "-DREVISION=\`svnversion .\`"; else echo "$(VER)"; fi`
 !begin am
-BUILT_SOURCES = empty.h
-CLEANFILES = empty.h
-empty.h: $(allsources)
-	echo '/* Empty file touched by automake makefile to force rebuild of version.o */' >$@
 bin_PROGRAMS = $(GAMES)
 !end
 !begin am_begin
 GAMES =
 !end
-!begin >empty.h
-/* Empty file touched by automake makefile to force rebuild of version.o */
-!end
-!begin nestedvm
-version.o: version.c version2.def
-	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
-version2.def: FORCE
-	if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
-		cat version.def > version2.def.new; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		echo "-DREVISION=`svnversion .`" >version2.def.new; \
-	else \
-		echo "$(VER)" >version2.def.new; \
-	fi && \
-	if diff -q version2.def.new version2.def; then \
-		rm version2.def.new; \
-	else \
-		mv version2.def.new version2.def; \
-	fi
-.PHONY: FORCE
-!end
-!specialobj nestedvm version
-# For OS X, this is made more fiddly by the fact that we don't have
-# md5sum readily available. We do, however, have `md5 -r' which
-# generates _nearly_ the same output, but it has no check function.
-!begin osx
-version.ppc.o: version.c version2.def
-	$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c -o $@
-version.i386.o: version.c version2.def
-	$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c -o $@
-version2.def: FORCE
-	if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
-		cat version.def > version2.def.new; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		echo "-DREVISION=`svnversion .`" >version2.def.new; \
-	else \
-		echo "$(VER)" >version2.def.new; \
-	fi && \
-	if diff -q version2.def.new version2.def; then \
-		rm version2.def.new; \
-	else \
-		mv version2.def.new version2.def; \
-	fi
-.PHONY: FORCE
-!end
-!specialobj osx version
 
 # make install for Unix.
 !begin gtk
@@ -236,11 +143,16 @@ test: benchmark.html benchmark.txt
 benchmark.html: benchmark.txt benchmark.pl
 	./benchmark.pl benchmark.txt > $@
 
-benchmark.txt: $(GAMES)
-	for i in $(GAMES); do \
-		for params in $$(env -i ./$(BINPREFIX)$$i --list-presets | cut -f1 -d' '); do \
-			env -i ./$(BINPREFIX)$$i --test-solve --time-generation --generate 100 $$params \
-			|| exit 1; \
-		done; \
-	done > $@
+benchmark.txt: benchmark.sh $(GAMES)
+	./benchmark.sh > $@
+
+!end
+!begin am
+test: benchmark.html benchmark.txt
+
+benchmark.html: benchmark.txt benchmark.pl
+	./benchmark.pl benchmark.txt > $@
+
+benchmark.txt: benchmark.sh $(GAMES)
+	./benchmark.sh > $@
 !end