X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/118fcd8b3809077068ec69c180068d0655f1a687..7dfe3b1f1f74b72acc13dd0f4c8ebb3e6f5162ac:/Recipe

diff --git a/Recipe b/Recipe
index c79f9a9..0b6c81c 100644
--- a/Recipe
+++ b/Recipe
@@ -13,12 +13,19 @@
 !makefile cygwin Makefile.cyg
 !makefile osx Makefile.osx
 
-WINDOWS  = windows user32.lib gdi32.lib comctl32.lib
+WINDOWS  = windows user32.lib gdi32.lib comctl32.lib comdlg32.lib
 COMMON   = midend misc malloc random version
-NET      = net tree234
+NET      = net tree234 dsf
 NETSLIDE = netslide tree234
+MINES    = mines tree234
+FLIP     = flip tree234
+PEGS     = pegs tree234
+UNTANGLE = untangle tree234
+SLANT    = slant dsf
 
 ALL      = list NET NETSLIDE cube fifteen sixteen rect pattern solo twiddle
+         + MINES samegame FLIP guess PEGS dominosa UNTANGLE blackbox SLANT
+         + lightup
 
 net      : [X] gtk COMMON NET
 netslide : [X] gtk COMMON NETSLIDE
@@ -29,6 +36,25 @@ 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
+slant    : [X] gtk COMMON SLANT
+lightup  : [X] gtk COMMON lightup
+
+# 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!
@@ -41,6 +67,16 @@ 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
+slant    : [G] WINDOWS COMMON SLANT
+lightup  : [G] WINDOWS COMMON lightup
 
 # Mac OS X unified application containing all the puzzles.
 Puzzles  : [MX] osx osx.icns osx-info.plist COMMON ALL
@@ -92,7 +128,7 @@ version.obj: *.c *.h
 !end
 !specialobj vc version
 !begin cygwin
-version.o: FORCE
+version.o: FORCE;
 FORCE:
 	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c
 !end
@@ -104,7 +140,7 @@ 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)" && svnversion . >&/dev/null; then \
+	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; \
@@ -119,10 +155,20 @@ 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)" && svnversion . >&/dev/null; then \
+	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 slant lightup; do \
+		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i; \
+	done
+!end