aboutsummaryrefslogtreecommitdiff
path: root/mkfiles.pl
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2005-01-24 12:09:51 +0000
committerSimon Tatham <anakin@pobox.com>2005-01-24 12:09:51 +0000
commitb10be2b32adc91e3d51117aeac8a75e59271d941 (patch)
tree608e4e5d61b59e293a5c3cca9012b6b0a7c03cdf /mkfiles.pl
parent2040ff96317be6b93ca459c44bfea5d775a18692 (diff)
downloadpuzzles-b10be2b32adc91e3d51117aeac8a75e59271d941.zip
puzzles-b10be2b32adc91e3d51117aeac8a75e59271d941.tar.gz
puzzles-b10be2b32adc91e3d51117aeac8a75e59271d941.tar.bz2
puzzles-b10be2b32adc91e3d51117aeac8a75e59271d941.tar.xz
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]
Diffstat (limited to 'mkfiles.pl')
-rwxr-xr-xmkfiles.pl2
1 files changed, 1 insertions, 1 deletions
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")) .