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] --- bridges.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bridges.R') diff --git a/bridges.R b/bridges.R index cbf4369..d1c4d37 100644 --- a/bridges.R +++ b/bridges.R @@ -1,12 +1,12 @@ # -*- makefile -*- -BRIDGES = bridges dsf +BRIDGES_EXTRA = dsf -bridges : [X] GTK COMMON BRIDGES bridges-icon|no-icon +bridges : [X] GTK COMMON bridges BRIDGES_EXTRA bridges-icon|no-icon -bridges : [G] WINDOWS COMMON BRIDGES bridges.res|noicon.res +bridges : [G] WINDOWS COMMON bridges BRIDGES_EXTRA bridges.res|noicon.res -ALL += BRIDGES +ALL += bridges[COMBINED] BRIDGES_EXTRA !begin gtk GAMES += bridges -- cgit v1.1