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] --- lightup.R | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lightup.R') diff --git a/lightup.R b/lightup.R index b7d2f2b..87246af 100644 --- a/lightup.R +++ b/lightup.R @@ -1,15 +1,15 @@ # -*- makefile -*- -LIGHTUP = lightup combi +LIGHTUP_EXTRA = combi -lightup : [X] GTK COMMON LIGHTUP lightup-icon|no-icon +lightup : [X] GTK COMMON lightup LIGHTUP_EXTRA lightup-icon|no-icon -lightup : [G] WINDOWS COMMON LIGHTUP lightup.res|noicon.res +lightup : [G] WINDOWS COMMON lightup LIGHTUP_EXTRA lightup.res|noicon.res -lightupsolver : [U] lightup[STANDALONE_SOLVER] combi STANDALONE -lightupsolver : [C] lightup[STANDALONE_SOLVER] combi STANDALONE +lightupsolver : [U] lightup[STANDALONE_SOLVER] LIGHTUP_EXTRA STANDALONE +lightupsolver : [C] lightup[STANDALONE_SOLVER] LIGHTUP_EXTRA STANDALONE -ALL += LIGHTUP +ALL += lightup[COMBINED] LIGHTUP_EXTRA !begin gtk GAMES += lightup -- cgit v1.1