From b10be2b32adc91e3d51117aeac8a75e59271d941 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 24 Jan 2005 12:09:51 +0000 Subject: The #definition of COMBINED was done very badly: it was a piece of platform-dependent code in puzzles.h (ick), which in turn depended on the magic symbol MAC_OS_X being defined by mkfiles.pl itself (yuck). Suddenly realised I can do much better simply by putting it in an OS X makefile extras section in Recipe, and removing both previous hacks. Much nicer. [originally from svn r5191] --- Recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Recipe') diff --git a/Recipe b/Recipe index fa1a78f..6c4d302 100644 --- a/Recipe +++ b/Recipe @@ -41,8 +41,11 @@ pattern : [G] WINDOWS COMMON pattern # Mac OS X unified application containing all the puzzles. Puzzles : [MX] osx osx.icns osx-info.plist COMMON ALL # For OS X, we must create the online help and include it in the -# application bundle.) +# application bundle.) Also we add -DCOMBINED to the compiler flags +# so as to inform the code that we're building a single binary for +# all the puzzles. !begin osx +CFLAGS += -DCOMBINED Puzzles_extra = Puzzles.app/Contents/Resources/Help/index.html Puzzles.app/Contents/Resources/Help/index.html: \ Puzzles.app/Contents/Resources/Help puzzles.but -- cgit v1.1