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] --- untangle.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'untangle.R') 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 -- cgit v1.1