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
map.R
View File

@ -1,15 +1,15 @@
# -*- makefile -*-
MAP = map dsf
MAP_EXTRA = dsf
map : [X] GTK COMMON MAP map-icon|no-icon
map : [X] GTK COMMON map MAP_EXTRA map-icon|no-icon
map : [G] WINDOWS COMMON MAP map.res|noicon.res
map : [G] WINDOWS COMMON map MAP_EXTRA map.res|noicon.res
mapsolver : [U] map[STANDALONE_SOLVER] dsf STANDALONE m.lib
mapsolver : [C] map[STANDALONE_SOLVER] dsf STANDALONE
mapsolver : [U] map[STANDALONE_SOLVER] MAP_EXTRA STANDALONE m.lib
mapsolver : [C] map[STANDALONE_SOLVER] MAP_EXTRA STANDALONE
ALL += MAP
ALL += map[COMBINED] MAP_EXTRA
!begin gtk
GAMES += map