!makefile gtk Makefile
!makefile vc Makefile.vc
+!makefile wce Makefile.wce
!makefile cygwin Makefile.cyg
!makefile osx Makefile.osx
+!makefile gnustep Makefile.gnustep
+!makefile nestedvm Makefile.nestedvm
-WINDOWS = windows printing
+!srcdir icons/
+
+WINDOWS_COMMON = printing
+ user32.lib gdi32.lib comctl32.lib comdlg32.lib winspool.lib
+WINDOWS = windows WINDOWS_COMMON
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 solo twiddle
- + MINES samegame FLIP guess PEGS dominosa UNTANGLE blackbox SLANT
- + LIGHTUP MAP LOOPY inertia TENTS BRIDGES
-
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.
+# Objects needed for 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!
-netgame : [G] WINDOWS COMMON NET
-netslide : [G] WINDOWS COMMON NETSLIDE
-cube : [G] WINDOWS COMMON cube
-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
+ALL = list
+
+# First half of list.c.
+!begin >list.c
+/*
+ * list.c: List of pointers to puzzle structures, for monolithic
+ * platforms.
+ *
+ * This file is automatically generated by mkfiles.pl. Do not edit
+ * it directly, or the changes will be lost next time mkfiles.pl runs.
+ * Instead, edit Recipe and/or its *.R subfiles.
+ */
+#include "puzzles.h"
+#define GAMELIST(A) \
+!end
+
+# Now each .R file adds part of the macro definition of GAMELIST to list.c.
+!include *.R
+
+# Then we finish up list.c as follows:
+!begin >list.c
+
+#define DECL(x) extern const game x;
+#define REF(x) &x,
+GAMELIST(DECL)
+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
# 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
rm -f raw.dmg devicename
!end
-# The `nullgame' source file is a largely blank one, which contains
-# all the correct function definitions to compile and link, but
-# which defines the null game in which nothing is ever drawn and
-# there are no valid moves. Its main purpose is to act as a
-# template for writing new game definition source files. I include
-# 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 : [G] WINDOWS COMMON nullgame
-
# 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:
# 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:
+version.o: version.c version2.def
+ $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+version2.def: 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; \
+ cat version.def > version2.def.new; \
+ elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
+ echo "-DREVISION=`svnversion .`" >version2.def.new; \
+ else \
+ echo "$(VER)" >version2.def.new; \
+ fi && \
+ if diff -q version2.def.new version2.def; then \
+ rm version2.def.new; \
else \
- $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+ mv version2.def.new version2.def; \
fi
+.PHONY: FORCE
!end
!specialobj gtk version
+!begin nestedvm
+version.o: version.c version2.def
+ $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+version2.def: FORCE
+ if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
+ cat version.def > version2.def.new; \
+ elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
+ echo "-DREVISION=`svnversion .`" >version2.def.new; \
+ else \
+ echo "$(VER)" >version2.def.new; \
+ fi && \
+ if diff -q version2.def.new version2.def; then \
+ rm version2.def.new; \
+ else \
+ mv version2.def.new version2.def; \
+ fi
+.PHONY: FORCE
+!end
+!specialobj nestedvm 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:
+version.ppc.o: version.c version2.def
+ $(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c -o $@
+version.i386.o: version.c version2.def
+ $(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c -o $@
+version2.def: 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; \
+ cat version.def > version2.def.new; \
+ elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
+ echo "-DREVISION=`svnversion .`" >version2.def.new; \
else \
- $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+ echo "$(VER)" >version2.def.new; \
+ fi && \
+ if diff -q version2.def.new version2.def; then \
+ rm version2.def.new; \
+ else \
+ mv version2.def.new version2.def; \
fi
+.PHONY: FORCE
!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 \
+ for i in $(GAMES); do \
+ $(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,UsermodeConstants,Runtime*}.class org/ibex/nestedvm
+ cp $(NESTEDVM)/build/org/ibex/nestedvm/util/{Platform*,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
~mdw / sgt / puzzles / blobdiff