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] --- solo.R | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'solo.R') diff --git a/solo.R b/solo.R index 594e014..09d1f7c 100644 --- a/solo.R +++ b/solo.R @@ -1,15 +1,15 @@ # -*- makefile -*- -SOLO = solo divvy dsf +SOLO_EXTRA = divvy dsf -solo : [X] GTK COMMON SOLO solo-icon|no-icon +solo : [X] GTK COMMON solo SOLO_EXTRA solo-icon|no-icon -solo : [G] WINDOWS COMMON SOLO solo.res|noicon.res +solo : [G] WINDOWS COMMON solo SOLO_EXTRA solo.res|noicon.res -solosolver : [U] solo[STANDALONE_SOLVER] divvy dsf STANDALONE -solosolver : [C] solo[STANDALONE_SOLVER] divvy dsf STANDALONE +solosolver : [U] solo[STANDALONE_SOLVER] SOLO_EXTRA STANDALONE +solosolver : [C] solo[STANDALONE_SOLVER] SOLO_EXTRA STANDALONE -ALL += SOLO +ALL += solo[COMBINED] SOLO_EXTRA !begin gtk GAMES += solo -- cgit v1.1