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 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")) . diff --git a/puzzles.h b/puzzles.h index d0882e3..4de81a7 100644 --- a/puzzles.h +++ b/puzzles.h @@ -199,14 +199,6 @@ struct game { int (*wants_statusbar)(void); }; -/* - * Here we include the knowledge of which platforms are of which - * type. - */ -#ifdef MAC_OS_X /* this must be defined in the OS X Makefile */ -#define COMBINED -#endif - /* * For one-game-at-a-time platforms, there's a single structure * like the above, under a fixed name. For all-at-once platforms,