X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/c4a7369dbcd2db1177a9b7e31345a05224c4f4ce..de3b0e332712c81307a7800808b6d13d2c5cec93:/Recipe

diff --git a/Recipe b/Recipe
index 9514252..92c09a4 100644
--- a/Recipe
+++ b/Recipe
@@ -13,12 +13,17 @@
 !makefile cygwin Makefile.cyg
 !makefile osx Makefile.osx
 
-WINDOWS  = windows user32.lib gdi32.lib comctl32.lib
-COMMON   = midend misc malloc random
+WINDOWS  = windows user32.lib gdi32.lib comctl32.lib comdlg32.lib
+COMMON   = midend misc malloc random version
 NET      = net tree234
 NETSLIDE = netslide tree234
+MINES    = mines tree234
+FLIP     = flip tree234
+PEGS     = pegs tree234
+UNTANGLE = untangle tree234
 
-ALL      = list NET NETSLIDE cube fifteen sixteen rect pattern
+ALL      = list NET NETSLIDE cube fifteen sixteen rect pattern solo twiddle
+         + MINES samegame FLIP guess PEGS dominosa UNTANGLE blackbox
 
 net      : [X] gtk COMMON NET
 netslide : [X] gtk COMMON NETSLIDE
@@ -27,6 +32,25 @@ fifteen  : [X] gtk COMMON fifteen
 sixteen  : [X] gtk COMMON sixteen
 rect     : [X] gtk COMMON rect
 pattern  : [X] gtk COMMON pattern
+solo     : [X] gtk COMMON solo
+twiddle  : [X] gtk COMMON twiddle
+mines    : [X] gtk COMMON MINES
+samegame : [X] gtk COMMON samegame
+flip     : [X] gtk COMMON FLIP
+guess    : [X] gtk COMMON guess
+pegs     : [X] gtk COMMON PEGS
+dominosa : [X] gtk COMMON dominosa
+untangle : [X] gtk COMMON UNTANGLE
+blackbox : [X] gtk COMMON blackbox
+
+# Auxiliary command-line programs.
+solosolver :    [U] solo[STANDALONE_SOLVER] malloc
+patternsolver : [U] pattern[STANDALONE_SOLVER] malloc
+mineobfusc :    [U] mines[STANDALONE_OBFUSCATOR] malloc random tree234 misc
+
+solosolver :    [C] solo[STANDALONE_SOLVER] malloc
+patternsolver : [C] pattern[STANDALONE_SOLVER] malloc
+mineobfusc :    [C] mines[STANDALONE_OBFUSCATOR] malloc random tree234 misc
 
 # The Windows Net shouldn't be called `net.exe' since Windows
 # already has a reasonably important utility program by that name!
@@ -37,6 +61,16 @@ fifteen  : [G] WINDOWS COMMON fifteen
 sixteen  : [G] WINDOWS COMMON sixteen
 rect     : [G] WINDOWS COMMON rect
 pattern  : [G] WINDOWS COMMON pattern
+solo     : [G] WINDOWS COMMON solo
+twiddle  : [G] WINDOWS COMMON twiddle
+mines    : [G] WINDOWS COMMON MINES
+samegame : [G] WINDOWS COMMON samegame
+flip     : [G] WINDOWS COMMON FLIP
+guess    : [G] WINDOWS COMMON guess
+pegs     : [G] WINDOWS COMMON PEGS
+dominosa : [G] WINDOWS COMMON dominosa
+untangle : [G] WINDOWS COMMON UNTANGLE
+blackbox : [G] WINDOWS COMMON blackbox
 
 # Mac OS X unified application containing all the puzzles.
 Puzzles  : [MX] osx osx.icns osx-info.plist COMMON ALL
@@ -80,3 +114,55 @@ Puzzles.dmg: Puzzles
 # be built on a regular basis.
 nullgame : [X] gtk COMMON nullgame
 nullgame : [G] WINDOWS COMMON nullgame
+
+# Version management.
+!begin vc
+version.obj: *.c *.h
+	cl $(VER) $(CFLAGS) /c version.c
+!end
+!specialobj vc 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; then \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
+	else \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+	fi
+!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.o: FORCE;
+FORCE:
+	if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c; \
+	elif test -z "$(VER)" && test -d .svn && svnversion . >&/dev/null; then \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
+	else \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+	fi
+!end
+!specialobj osx version
+
+# make install for Unix.
+!begin gtk
+install:
+	for i in cube net netslide fifteen sixteen twiddle \
+	         pattern rect solo mines samegame flip guess \
+		 pegs dominosa untangle blackbox; do \
+		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i; \
+	done
+!end