aboutsummaryrefslogtreecommitdiff
path: root/map.R
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2008-09-13 19:17:26 +0000
committerSimon Tatham <anakin@pobox.com>2008-09-13 19:17:26 +0000
commit43eafe1fdf356c0c1c88936ffa79c83291973b5d (patch)
tree8f69ef744fcb39738240fe2d125f9924514d4810 /map.R
parent1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96 (diff)
downloadpuzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.zip
puzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.tar.gz
puzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.tar.bz2
puzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.tar.xz
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]
Diffstat (limited to 'map.R')
-rw-r--r--map.R12
1 files changed, 6 insertions, 6 deletions
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