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]
This commit is contained in:
Simon Tatham
2008-09-13 19:17:26 +00:00
parent 1d661ec46b
commit 43eafe1fdf
28 changed files with 95 additions and 93 deletions

12
tents.R
View File

@ -1,15 +1,15 @@
# -*- makefile -*-
TENTS = tents maxflow
TENTS_EXTRA = maxflow
tents : [X] GTK COMMON TENTS tents-icon|no-icon
tents : [X] GTK COMMON tents TENTS_EXTRA tents-icon|no-icon
tents : [G] WINDOWS COMMON TENTS tents.res|noicon.res
tents : [G] WINDOWS COMMON tents TENTS_EXTRA tents.res|noicon.res
ALL += TENTS
ALL += tents[COMBINED] TENTS_EXTRA
tentssolver : [U] tents[STANDALONE_SOLVER] maxflow STANDALONE
tentssolver : [C] tents[STANDALONE_SOLVER] maxflow STANDALONE
tentssolver : [U] tents[STANDALONE_SOLVER] TENTS_EXTRA STANDALONE
tentssolver : [C] tents[STANDALONE_SOLVER] TENTS_EXTRA STANDALONE
!begin gtk
GAMES += tents