X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Recipe;h=ba8317f51a090c4ced54d305cdae2e1e212df4f0;hb=3234912f921916a1b8da164fd61dc75579358577;hp=e377acde08d3a2f59adbd38a17d4cdf293359bdf;hpb=ec38952c4c8e924c1c89ad5b934c6b8e70ce4102;p=sgt-puzzles.git

diff --git a/Recipe b/Recipe
index e377acd..ba8317f 100644
--- a/Recipe
+++ b/Recipe
@@ -8,17 +8,21 @@
 
 !name puzzles
 
-!makefile gtk Makefile
+!makefile gtk Makefile.gtk
+!makefile am Makefile.am
 !makefile vc Makefile.vc
 !makefile wce Makefile.wce
 !makefile cygwin Makefile.cyg
 !makefile osx Makefile.osx
+!makefile gnustep Makefile.gnustep
 !makefile nestedvm Makefile.nestedvm
+!makefile emcc Makefile.emcc
 
 !srcdir icons/
 
-WINDOWS  = windows printing
+WINDOWS_COMMON = printing
          + user32.lib gdi32.lib comctl32.lib comdlg32.lib winspool.lib
+WINDOWS  = windows WINDOWS_COMMON
 COMMON   = midend drawing misc malloc random version
 GTK      = gtk printing ps
 # Objects needed for auxiliary command-line programs.
@@ -56,6 +60,8 @@ const int gamecount = lenof(gamelist);
 # Unix standalone application for special-purpose obfuscation.
 obfusc : [U] obfusc STANDALONE
 
+puzzles  : [G] windows[COMBINED] WINDOWS_COMMON COMMON ALL noicon.res
+
 # Mac OS X unified application containing all the puzzles.
 Puzzles  : [MX] osx osx.icns osx-info.plist COMMON ALL
 # For OS X, we must create the online help and include it in the
@@ -87,79 +93,18 @@ 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
+!begin am
+bin_PROGRAMS = $(GAMES)
 !end
-!specialobj wce version
-!begin cygwin
-version.o: FORCE;
-FORCE:
-	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c
+!begin am_begin
+GAMES =
 !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: FORCE;
-FORCE:
-	if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
-	else \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
-	fi
-!end
-!specialobj gtk version
-!begin nestedvm
-version.o: FORCE;
-FORCE:
-	if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
-	else \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
-	fi
-!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: FORCE;
-FORCE:
-	if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
-		$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c -o version.ppc.o; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c -o version.ppc.o; \
-	else \
-		$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c -o version.ppc.o; \
-	fi
-version.i386.o: FORCE2;
-FORCE2:
-	if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
-		$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c -o version.i386.o; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c -o version.i386.o; \
-	else \
-		$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c -o version.i386.o; \
-	fi
-!end
-!specialobj osx version
 
 # make install for Unix.
 !begin gtk
 install:
 	for i in $(GAMES); do \
-		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i \
+		$(INSTALL_PROGRAM) -m 755 $(BINPREFIX)$$i $(DESTDIR)$(gamesdir)/$(BINPREFIX)$$i \
 		|| exit 1; \
 	done
 !end
@@ -173,8 +118,11 @@ install:
 
 org:
 	mkdir -p org/ibex/nestedvm/util
-	cp $(NESTEDVM)/build/org/ibex/nestedvm/{Registers,UsermodeConstants,Runtime*}.class org/ibex/nestedvm
-	cp $(NESTEDVM)/build/org/ibex/nestedvm/util/{Platform*,Seekable*}.class org/ibex/nestedvm/util
+	cp $(NESTEDVM)/build/org/ibex/nestedvm/Registers.class org/ibex/nestedvm
+	cp $(NESTEDVM)/build/org/ibex/nestedvm/UsermodeConstants.class org/ibex/nestedvm
+	cp $(NESTEDVM)/build/org/ibex/nestedvm/Runtime*.class org/ibex/nestedvm
+	cp $(NESTEDVM)/build/org/ibex/nestedvm/util/Platform*.class org/ibex/nestedvm/util
+	cp $(NESTEDVM)/build/org/ibex/nestedvm/util/Seekable*.class org/ibex/nestedvm/util
 	echo "Main-Class: PuzzleApplet" >applet.manifest
 
 PuzzleApplet.class: PuzzleApplet.java org
@@ -186,3 +134,24 @@ PuzzleApplet.class: PuzzleApplet.java org
 	echo '<applet archive="'$@'" code="PuzzleApplet" width="700" height="500"></applet>' >$*.html
 	mv PuzzleEngine.class $<
 !end
+
+# A benchmarking and testing target for the GTK puzzles.
+!begin gtk
+test: benchmark.html benchmark.txt
+
+benchmark.html: benchmark.txt benchmark.pl
+	./benchmark.pl benchmark.txt > $@
+
+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