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

diff --git a/Recipe b/Recipe
index 2decb2f..3b57ef5 100644
--- a/Recipe
+++ b/Recipe
@@ -8,16 +8,22 @@
 
 !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
+!makefile clangcl Makefile.clangcl
 
 !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.
@@ -52,6 +58,11 @@ const game *gamelist[] = { GAMELIST(REF) };
 const int gamecount = lenof(gamelist);
 !end
 
+# 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
@@ -60,7 +71,6 @@ Puzzles  : [MX] osx osx.icns osx-info.plist COMMON ALL
 # all the puzzles. Then I've also got some code in here to build a
 # distributable .dmg disk image.
 !begin osx
-CFLAGS += -DCOMBINED
 Puzzles_extra = Puzzles.app/Contents/Resources/Help/index.html
 Puzzles.app/Contents/Resources/Help/index.html: \
 	Puzzles.app/Contents/Resources/Help osx-help.but puzzles.but
@@ -84,67 +94,65 @@ 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: 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
+!begin am
+bin_PROGRAMS = $(GAMES)
 !end
-!specialobj gtk 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
+!begin am_begin
+GAMES =
 !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
+!begin nestedvm
+.PRECIOUS: %.class
+%.class: %.mips
+	java -cp $(NESTEDVM)/build:$(NESTEDVM)/upstream/build/classgen/build \
+		org.ibex.nestedvm.Compiler -outformat class -d . \
+		PuzzleEngine $<
+		mv PuzzleEngine.class $@
+
+org:
+	mkdir -p 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
+	javac -source 1.3 -target 1.3 PuzzleApplet.java
+
+%.jar: %.class PuzzleApplet.class org
+	mv $< PuzzleEngine.class
+	jar cfm $@ applet.manifest PuzzleEngine.class PuzzleApplet*.class 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