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