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

diff --git a/Recipe b/Recipe
index fa1a78f..a772e80 100644
--- a/Recipe
+++ b/Recipe
@@ -14,11 +14,14 @@
 !makefile osx Makefile.osx
 
 WINDOWS  = windows user32.lib gdi32.lib comctl32.lib
-COMMON   = midend misc malloc random
+COMMON   = midend misc malloc random version
 NET      = net tree234
 NETSLIDE = netslide tree234
+MINES    = mines tree234
+FLIP     = flip 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
 
 net      : [X] gtk COMMON NET
 netslide : [X] gtk COMMON NETSLIDE
@@ -27,6 +30,12 @@ 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
 
 # The Windows Net shouldn't be called `net.exe' since Windows
 # already has a reasonably important utility program by that name!
@@ -37,18 +46,43 @@ 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
 
 # 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
@@ -61,3 +95,54 @@ Puzzles.app/Contents/Resources/Help: Puzzles.app/Contents/Resources
 # 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; do \
+		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i; \
+	done
+!end