Change to the handling of -DCOMBINED in the makefiles. Instead of

defining it centrally per port, I think it's neater to define it for
each puzzle when adding that puzzle to the ALL list - because those
front ends which take -DCOMBINED are precisely those which use ALL.
In particular, this change opens up the possibility of compiling
both individual puzzles _and_ a combined monolith within the same
makefile.

[originally from svn r8178]

1 files changed, 4 insertions, 4 deletions

diff --git a/unequal.R b/unequal.R
index 014440e..ef6fe53 100644
--- a/unequal.R
+++ b/unequal.R
@@ -1,10 +1,10 @@
 # -*- makefile -*-
 
-UNEQUAL  = unequal latin tree234 maxflow
+UNEQUAL_EXTRA = latin tree234 maxflow
 
-unequal  : [X] GTK COMMON UNEQUAL unequal-icon|no-icon
+unequal  : [X] GTK COMMON unequal UNEQUAL_EXTRA unequal-icon|no-icon
 
-unequal  : [G] WINDOWS COMMON UNEQUAL unequal.res|noicon.res
+unequal  : [G] WINDOWS COMMON unequal UNEQUAL_EXTRA unequal.res|noicon.res
 
 unequalsolver : [U] unequal[STANDALONE_SOLVER] latin[STANDALONE_SOLVER] tree234 maxflow STANDALONE
 unequalsolver : [C] unequal[STANDALONE_SOLVER] latin[STANDALONE_SOLVER] tree234 maxflow STANDALONE
@@ -12,7 +12,7 @@ unequalsolver : [C] unequal[STANDALONE_SOLVER] latin[STANDALONE_SOLVER] tree234
 latincheck : [U] latin[STANDALONE_LATIN_TEST] tree234 maxflow STANDALONE
 latincheck : [C] latin[STANDALONE_LATIN_TEST] tree234 maxflow STANDALONE
 
-ALL += UNEQUAL
+ALL += unequal[COMBINED] UNEQUAL_EXTRA
 
 !begin gtk
 GAMES += unequal