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] --- galaxies.R | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'galaxies.R') diff --git a/galaxies.R b/galaxies.R index 20985f4..bfa347a 100644 --- a/galaxies.R +++ b/galaxies.R @@ -1,19 +1,19 @@ # -*- makefile -*- -GALAXIES = galaxies dsf +GALAXIES_EXTRA = dsf -galaxies : [X] GTK COMMON GALAXIES galaxies-icon|no-icon +galaxies : [X] GTK COMMON galaxies GALAXIES_EXTRA galaxies-icon|no-icon -galaxies : [G] WINDOWS COMMON GALAXIES galaxies.res|noicon.res +galaxies : [G] WINDOWS COMMON galaxies GALAXIES_EXTRA galaxies.res|noicon.res -galaxiessolver : [U] galaxies[STANDALONE_SOLVER] dsf STANDALONE m.lib -galaxiessolver : [C] galaxies[STANDALONE_SOLVER] dsf STANDALONE +galaxiessolver : [U] galaxies[STANDALONE_SOLVER] GALAXIES_EXTRA STANDALONE m.lib +galaxiessolver : [C] galaxies[STANDALONE_SOLVER] GALAXIES_EXTRA STANDALONE -galaxiespicture : [U] galaxies[STANDALONE_PICTURE_GENERATOR] dsf STANDALONE +galaxiespicture : [U] galaxies[STANDALONE_PICTURE_GENERATOR] GALAXIES_EXTRA STANDALONE + m.lib -galaxiespicture : [C] galaxies[STANDALONE_PICTURE_GENERATOR] dsf STANDALONE +galaxiespicture : [C] galaxies[STANDALONE_PICTURE_GENERATOR] GALAXIES_EXTRA STANDALONE -ALL += galaxies +ALL += galaxies[COMBINED] GALAXIES_EXTRA !begin gtk GAMES += galaxies -- cgit v1.1