puzzles: refactor and resync with upstream

This brings puzzles up-to-date with upstream revision
2d333750272c3967cfd5cd3677572cddeaad5932, though certain changes made
by me, including cursor-only Untangle and some compilation fixes
remain. Upstream code has been moved to its separate subdirectory and
future syncs can be done by simply copying over the new sources.

Change-Id: Ia6506ca5f78c3627165ea6791d38db414ace0804

1 files changed, 412 insertions, 0 deletions

diff --git a/apps/plugins/puzzles/src/Makefile.gnustep b/apps/plugins/puzzles/src/Makefile.gnustep
new file mode 100644
index 0000000..79677f2
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.gnustep
@@ -0,0 +1,412 @@
+# Makefile for puzzles under GNUstep.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+NEEDS_GUI=yes
+include $(GNUSTEP_MAKEFILES)/common.make
+include $(GNUSTEP_MAKEFILES)/rules.make
+include $(GNUSTEP_MAKEFILES)/Instance/rules.make
+
+all:: Puzzles fifteensolver fillingsolver galaxiespicture galaxiessolver \
+		keensolver latincheck lightupsolver loopysolver \
+		magnetssolver mapsolver mineobfusc obfusc patternpicture \
+		patternsolver pearlbench signpostsolver singlessolver \
+		slantsolver solosolver tentssolver towerssolver \
+		unequalsolver unrulysolver
+
+.SUFFIXES: .o .c .m
+
+
+
+Puzzles.app:
+	mkdir -p $@
+Puzzles.app/Resources: Puzzles.app
+	mkdir -p $@
+Puzzles.app/Resources/Puzzles.icns: Puzzles.app/Resources osx.icns
+	cp osx.icns $@
+Puzzles.app/Info.plist: Puzzles.app osx-info.plist
+	cp osx-info.plist $@
+Puzzles: Puzzles.app Puzzles.app/Puzzles \
+		Puzzles.app/Resources/Puzzles.icns Puzzles.app/Info.plist \
+		$(Puzzles_extra)
+
+Puzzles.app/Puzzles: blackbo3.o bridges3.o combi.o cube3.o divvy.o \
+		dominos3.o drawing.o dsf.o fifteen5.o filling5.o findloop.o \
+		flip3.o flood3.o galaxie7.o grid.o guess3.o inertia3.o \
+		keen5.o latin.o laydomino.o lightup5.o list.o loopgen.o \
+		loopy5.o magnets5.o malloc.o map5.o maxflow.o midend.o \
+		mines5.o misc.o net3.o netslid3.o osx.o palisad3.o \
+		pattern7.o pearl5.o pegs3.o penrose.o random.o range3.o \
+		rect3.o samegam3.o signpos5.o singles5.o sixteen3.o slant5.o \
+		solo5.o tdq.o tents5.o towers5.o tracks3.o tree234.o \
+		twiddle3.o undead3.o unequal5.o unruly5.o untangl3.o \
+		version.o
+	$(CC) $(ALL_LDFLAGS) -o $@ blackbo3.o bridges3.o combi.o cube3.o \
+		divvy.o dominos3.o drawing.o dsf.o fifteen5.o filling5.o \
+		findloop.o flip3.o flood3.o galaxie7.o grid.o guess3.o \
+		inertia3.o keen5.o latin.o laydomino.o lightup5.o list.o \
+		loopgen.o loopy5.o magnets5.o malloc.o map5.o maxflow.o \
+		midend.o mines5.o misc.o net3.o netslid3.o osx.o palisad3.o \
+		pattern7.o pearl5.o pegs3.o penrose.o random.o range3.o \
+		rect3.o samegam3.o signpos5.o singles5.o sixteen3.o slant5.o \
+		solo5.o tdq.o tents5.o towers5.o tracks3.o tree234.o \
+		twiddle3.o undead3.o unequal5.o unruly5.o untangl3.o \
+		version.o $(ALL_LIB_DIRS)  $(ALL_LIBS)
+
+fifteensolver: fifteen2.o malloc.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ fifteen2.o malloc.o misc.o nullfe.o random.o
+
+fillingsolver: dsf.o filling2.o malloc.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o filling2.o malloc.o misc.o nullfe.o \
+		random.o 
+
+galaxiespicture: dsf.o galaxie4.o malloc.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o galaxie4.o malloc.o misc.o nullfe.o \
+		random.o -lm
+
+galaxiessolver: dsf.o galaxie2.o malloc.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o galaxie2.o malloc.o misc.o nullfe.o \
+		random.o -lm
+
+keensolver: dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o nullfe.o \
+		random.o tree234.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o keen2.o latin6.o malloc.o maxflow.o \
+		misc.o nullfe.o random.o tree234.o 
+
+latincheck: latin8.o malloc.o maxflow.o misc.o nullfe.o random.o tree234.o
+	$(CC) $(ULDFLAGS) -o $@ latin8.o malloc.o maxflow.o misc.o nullfe.o \
+		random.o tree234.o 
+
+lightupsolver: combi.o lightup2.o malloc.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ combi.o lightup2.o malloc.o misc.o nullfe.o \
+		random.o 
+
+loopysolver: dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o nullfe.o \
+		penrose.o random.o tree234.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o grid.o loopgen.o loopy2.o malloc.o \
+		misc.o nullfe.o penrose.o random.o tree234.o -lm
+
+magnetssolver: laydomino.o magnets2.o malloc.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ laydomino.o magnets2.o malloc.o misc.o \
+		nullfe.o random.o -lm
+
+mapsolver: dsf.o malloc.o map2.o misc.o nullfe.o random.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o malloc.o map2.o misc.o nullfe.o \
+		random.o -lm
+
+mineobfusc: malloc.o mines2.o misc.o nullfe.o random.o tree234.o
+	$(CC) $(ULDFLAGS) -o $@ malloc.o mines2.o misc.o nullfe.o random.o \
+		tree234.o 
+
+obfusc: malloc.o misc.o nullfe.o obfusc.o random.o
+	$(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o obfusc.o random.o 
+
+patternpicture: malloc.o misc.o nullfe.o pattern4.o random.o
+	$(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o pattern4.o random.o
+
+patternsolver: malloc.o misc.o nullfe.o pattern2.o random.o
+	$(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o pattern2.o random.o
+
+pearlbench: dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o pearl2.o \
+		penrose.o random.o tdq.o tree234.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o grid.o loopgen.o malloc.o misc.o \
+		nullfe.o pearl2.o penrose.o random.o tdq.o tree234.o -lm
+
+signpostsolver: dsf.o malloc.o misc.o nullfe.o random.o signpos2.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o malloc.o misc.o nullfe.o random.o \
+		signpos2.o -lm
+
+singlessolver: dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o random.o \
+		singles3.o tree234.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o latin.o malloc.o maxflow.o misc.o \
+		nullfe.o random.o singles3.o tree234.o 
+
+slantsolver: dsf.o findloop.o malloc.o misc.o nullfe.o random.o slant2.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o findloop.o malloc.o misc.o nullfe.o \
+		random.o slant2.o 
+
+solosolver: divvy.o dsf.o malloc.o misc.o nullfe.o random.o solo2.o
+	$(CC) $(ULDFLAGS) -o $@ divvy.o dsf.o malloc.o misc.o nullfe.o \
+		random.o solo2.o 
+
+tentssolver: dsf.o malloc.o maxflow.o misc.o nullfe.o random.o tents3.o
+	$(CC) $(ULDFLAGS) -o $@ dsf.o malloc.o maxflow.o misc.o nullfe.o \
+		random.o tents3.o 
+
+towerssolver: latin6.o malloc.o maxflow.o misc.o nullfe.o random.o towers2.o \
+		tree234.o
+	$(CC) $(ULDFLAGS) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o \
+		random.o towers2.o tree234.o 
+
+unequalsolver: latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+		tree234.o unequal2.o
+	$(CC) $(ULDFLAGS) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o \
+		random.o tree234.o unequal2.o 
+
+unrulysolver: malloc.o misc.o nullfe.o random.o unruly2.o
+	$(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o random.o unruly2.o 
+
+blackbox.o: ./blackbox.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+gtk.o: ./gtk.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.o: ./nullfe.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+	$(CC) -DGNUSTEP $(ALL_OBJCFLAGS) $(COMPAT) $(FWHACK) $(OBJCFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+	$(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+clean::
+	rm -f *.o fifteensolver fillingsolver galaxiespicture galaxiessolver keensolver latincheck lightupsolver loopysolver magnetssolver mapsolver mineobfusc obfusc patternpicture patternsolver pearlbench signpostsolver singlessolver slantsolver solosolver tentssolver towerssolver unequalsolver unrulysolver
+	rm -rf *.app