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] --- mkfiles.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkfiles.pl') diff --git a/mkfiles.pl b/mkfiles.pl index aa257ed..8f3c7cf 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -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")) . -- cgit v1.1