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 -*-
FILLING = filling dsf
FILLING_EXTRA = dsf
fillingsolver : [U] filling[STANDALONE_SOLVER] dsf STANDALONE
fillingsolver : [C] filling[STANDALONE_SOLVER] dsf STANDALONE
fillingsolver : [U] filling[STANDALONE_SOLVER] FILLING_EXTRA STANDALONE
fillingsolver : [C] filling[STANDALONE_SOLVER] FILLING_EXTRA STANDALONE
filling : [X] GTK COMMON FILLING filling-icon|no-icon
filling : [X] GTK COMMON filling FILLING_EXTRA filling-icon|no-icon
filling : [G] WINDOWS COMMON FILLING filling.res|noicon.res
filling : [G] WINDOWS COMMON filling FILLING_EXTRA filling.res|noicon.res
ALL += filling
ALL += filling[COMBINED] FILLING_EXTRA
!begin gtk
GAMES += filling