aboutsummaryrefslogtreecommitdiff
path: root/untangle.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 /untangle.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 'untangle.R')
-rw-r--r--untangle.R8
1 files changed, 4 insertions, 4 deletions
diff --git a/untangle.R b/untangle.R
index 5943295..83ab0d8 100644
--- a/untangle.R
+++ b/untangle.R
@@ -1,12 +1,12 @@
# -*- makefile -*-
-UNTANGLE = untangle tree234
+UNTANGLE_EXTRA = tree234
-untangle : [X] GTK COMMON UNTANGLE untangle-icon|no-icon
+untangle : [X] GTK COMMON untangle UNTANGLE_EXTRA untangle-icon|no-icon
-untangle : [G] WINDOWS COMMON UNTANGLE untangle.res|noicon.res
+untangle : [G] WINDOWS COMMON untangle UNTANGLE_EXTRA untangle.res|noicon.res
-ALL += UNTANGLE
+ALL += untangle[COMBINED] UNTANGLE_EXTRA
!begin gtk
GAMES += untangle