aboutsummaryrefslogtreecommitdiff
path: root/galaxies.R
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2008-09-13 19:17:26 +0000
committerSimon Tatham <anakin@pobox.com>2008-09-13 19:17:26 +0000
commit43eafe1fdf356c0c1c88936ffa79c83291973b5d (patch)
tree8f69ef744fcb39738240fe2d125f9924514d4810 /galaxies.R
parent1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96 (diff)
downloadpuzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.zip
puzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.tar.gz
puzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.tar.bz2
puzzles-43eafe1fdf356c0c1c88936ffa79c83291973b5d.tar.xz
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]
Diffstat (limited to 'galaxies.R')
-rw-r--r--galaxies.R16
1 files changed, 8 insertions, 8 deletions
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