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

View File

@ -1,12 +1,12 @@
# -*- makefile -*-
UNTANGLE = untangle tree234
UNTANGLE_EXTRA = tree234
untangle : [X] GTK COMMON UNTANGLE untangle-icon|no-icon
untangle : [X] GTK COMMON untangle UNTANGLE_EXTRA untangle-icon|no-icon
untangle : [G] WINDOWS COMMON UNTANGLE untangle.res|noicon.res
untangle : [G] WINDOWS COMMON untangle UNTANGLE_EXTRA untangle.res|noicon.res
ALL += UNTANGLE
ALL += untangle[COMBINED] UNTANGLE_EXTRA
!begin gtk
GAMES += untangle