From 43eafe1fdf356c0c1c88936ffa79c83291973b5d Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 13 Sep 2008 19:17:26 +0000 Subject: 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] --- map.R | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'map.R') diff --git a/map.R b/map.R index aa7f11e..a26e8b8 100644 --- a/map.R +++ b/map.R @@ -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 -- cgit v1.1