X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/fccfd04d997793b4ec8f4ec500db56e67ba83ac0..5b0ab052105670986ec973f035b758add4d25481:/Recipe

diff --git a/Recipe b/Recipe
index fa1a78f..9bdd30e 100644
--- a/Recipe
+++ b/Recipe
@@ -13,20 +13,71 @@
 !makefile cygwin Makefile.cyg
 !makefile osx Makefile.osx
 
-WINDOWS  = windows user32.lib gdi32.lib comctl32.lib
-COMMON   = midend misc malloc random
-NET      = net tree234
+WINDOWS  = windows printing
+         + user32.lib gdi32.lib comctl32.lib comdlg32.lib winspool.lib
+COMMON   = midend drawing misc malloc random version
+NET      = net tree234 dsf
 NETSLIDE = netslide tree234
+MINES    = mines tree234
+FLIP     = flip tree234
+PEGS     = pegs tree234
+UNTANGLE = untangle tree234
+SLANT    = slant dsf
+MAP      = map dsf
+LOOPY    = loopy tree234 dsf
+LIGHTUP  = lightup combi
+TENTS    = tents maxflow
+BRIDGES  = bridges dsf
 
-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 SLANT
+         + LIGHTUP MAP LOOPY inertia TENTS BRIDGES
 
-net      : [X] gtk COMMON NET
-netslide : [X] gtk COMMON NETSLIDE
-cube     : [X] gtk COMMON cube
-fifteen  : [X] gtk COMMON fifteen
-sixteen  : [X] gtk COMMON sixteen
-rect     : [X] gtk COMMON rect
-pattern  : [X] gtk COMMON pattern
+GTK      = gtk printing ps
+
+net      : [X] GTK COMMON NET
+netslide : [X] GTK COMMON NETSLIDE
+cube     : [X] GTK COMMON cube
+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
+slant    : [X] GTK COMMON SLANT
+lightup  : [X] GTK COMMON LIGHTUP
+map      : [X] GTK COMMON MAP
+loopy    : [X] GTK COMMON LOOPY
+inertia  : [X] GTK COMMON inertia
+tents    : [X] GTK COMMON TENTS
+bridges  : [X] GTK COMMON BRIDGES
+
+# Auxiliary command-line programs.
+STANDALONE = nullfe random misc malloc
+
+solosolver :    [U] solo[STANDALONE_SOLVER] STANDALONE
+patternsolver : [U] pattern[STANDALONE_SOLVER] STANDALONE
+mineobfusc :    [U] mines[STANDALONE_OBFUSCATOR] tree234 STANDALONE
+slantsolver :   [U] slant[STANDALONE_SOLVER] dsf STANDALONE
+mapsolver :     [U] map[STANDALONE_SOLVER] dsf STANDALONE m.lib
+lightupsolver : [U] lightup[STANDALONE_SOLVER] combi STANDALONE
+tentssolver :   [U] tents[STANDALONE_SOLVER] maxflow STANDALONE
+
+solosolver :    [C] solo[STANDALONE_SOLVER] STANDALONE
+patternsolver : [C] pattern[STANDALONE_SOLVER] STANDALONE
+mineobfusc :    [C] mines[STANDALONE_OBFUSCATOR] tree234 STANDALONE
+slantsolver :   [C] slant[STANDALONE_SOLVER] dsf STANDALONE
+mapsolver :     [C] map[STANDALONE_SOLVER] dsf STANDALONE
+lightupsolver : [C] lightup[STANDALONE_SOLVER] combi STANDALONE
+tentssolver :   [C] tents[STANDALONE_SOLVER] maxflow STANDALONE
 
 # The Windows Net shouldn't be called `net.exe' since Windows
 # already has a reasonably important utility program by that name!
@@ -37,18 +88,54 @@ 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
+slant    : [G] WINDOWS COMMON SLANT
+lightup  : [G] WINDOWS COMMON LIGHTUP
+map      : [G] WINDOWS COMMON MAP
+loopy    : [G] WINDOWS COMMON LOOPY
+inertia  : [G] WINDOWS COMMON inertia
+tents    : [G] WINDOWS COMMON TENTS
+bridges  : [G] WINDOWS COMMON BRIDGES
 
 # 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
-# application bundle.)
+# application bundle.) Also we add -DCOMBINED to the compiler flags
+# so as to inform the code that we're building a single binary for
+# 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 puzzles.but
-	halibut --html=$@ puzzles.but
+	Puzzles.app/Contents/Resources/Help osx-help.but puzzles.but
+	cd Puzzles.app/Contents/Resources/Help; \
+		halibut --html ../../../../osx-help.but ../../../../puzzles.but
 Puzzles.app/Contents/Resources/Help: Puzzles.app/Contents/Resources
 	mkdir -p Puzzles.app/Contents/Resources/Help
+
+release: Puzzles.dmg
+Puzzles.dmg: Puzzles
+	rm -f raw.dmg
+	hdiutil create -megabytes 5 -layout NONE raw.dmg
+	hdid -nomount raw.dmg > devicename
+	newfs_hfs -v "Simon Tatham's Puzzle Collection" `cat devicename`
+	hdiutil eject `cat devicename`
+	hdid raw.dmg | cut -f1 -d' ' > devicename
+	cp -R Puzzles.app /Volumes/"Simon Tatham's Puzzle Collection"
+	hdiutil eject `cat devicename`
+	rm -f Puzzles.dmg
+	hdiutil convert -format UDCO raw.dmg -o Puzzles.dmg
+	rm -f raw.dmg devicename
 !end
 
 # The `nullgame' source file is a largely blank one, which contains
@@ -59,5 +146,59 @@ Puzzles.app/Contents/Resources/Help: Puzzles.app/Contents/Resources
 # it in the Makefile because it will be worse than useless if it
 # ever fails to compile, so it's important that it should actually
 # be built on a regular basis.
-nullgame : [X] gtk COMMON nullgame
+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 slant lightup \
+		 map loopy inertia tents bridges; do \
+		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i \
+		|| exit 1; \
+	done
+!end