aboutsummaryrefslogtreecommitdiff
path: root/tents.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 /tents.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 'tents.R')
-rw-r--r--tents.R12
1 files changed, 6 insertions, 6 deletions
diff --git a/tents.R b/tents.R
index 0079c5b..76c0bec 100644
--- a/tents.R
+++ b/tents.R
@@ -1,15 +1,15 @@
# -*- makefile -*-
-TENTS = tents maxflow
+TENTS_EXTRA = maxflow
-tents : [X] GTK COMMON TENTS tents-icon|no-icon
+tents : [X] GTK COMMON tents TENTS_EXTRA tents-icon|no-icon
-tents : [G] WINDOWS COMMON TENTS tents.res|noicon.res
+tents : [G] WINDOWS COMMON tents TENTS_EXTRA tents.res|noicon.res
-ALL += TENTS
+ALL += tents[COMBINED] TENTS_EXTRA
-tentssolver : [U] tents[STANDALONE_SOLVER] maxflow STANDALONE
-tentssolver : [C] tents[STANDALONE_SOLVER] maxflow STANDALONE
+tentssolver : [U] tents[STANDALONE_SOLVER] TENTS_EXTRA STANDALONE
+tentssolver : [C] tents[STANDALONE_SOLVER] TENTS_EXTRA STANDALONE
!begin gtk
GAMES += tents