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]
This commit is contained in:
Simon Tatham
2005-01-24 12:09:51 +00:00
parent 2040ff9631
commit b10be2b32a
3 changed files with 5 additions and 10 deletions

View File

@ -1128,7 +1128,7 @@ if (defined $makefiles{'osx'}) {
print
"CC = \$(TOOLPATH)gcc\n".
"\n".
&splitline("CFLAGS = -O2 -Wall -Werror -g -DMAC_OS_X " .
&splitline("CFLAGS = -O2 -Wall -Werror -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
"LDFLAGS = -framework Cocoa\n".
&splitline("all:" . join "", map { " $_" } &progrealnames("MX")) .