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,15 +1,15 @@
# -*- makefile -*-
LIGHTUP = lightup combi
LIGHTUP_EXTRA = combi
lightup : [X] GTK COMMON LIGHTUP lightup-icon|no-icon
lightup : [X] GTK COMMON lightup LIGHTUP_EXTRA lightup-icon|no-icon
lightup : [G] WINDOWS COMMON LIGHTUP lightup.res|noicon.res
lightup : [G] WINDOWS COMMON lightup LIGHTUP_EXTRA lightup.res|noicon.res
lightupsolver : [U] lightup[STANDALONE_SOLVER] combi STANDALONE
lightupsolver : [C] lightup[STANDALONE_SOLVER] combi STANDALONE
lightupsolver : [U] lightup[STANDALONE_SOLVER] LIGHTUP_EXTRA STANDALONE
lightupsolver : [C] lightup[STANDALONE_SOLVER] LIGHTUP_EXTRA STANDALONE
ALL += LIGHTUP
ALL += lightup[COMBINED] LIGHTUP_EXTRA
!begin gtk
GAMES += lightup