From 515f957a67b0794aab7e05db9b0b8fbc1e09b318 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Fri, 6 Nov 2009 19:59:12 -0800 Subject: makefile: unify two Darwin-specific sections Signed-off-by: Steven Noonan --- crawl-ref/source/makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index eecf780485..9682238161 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -112,7 +112,12 @@ ifeq ($(uname_S),DOS) NO_RDYNAMIC = yes endif ifeq ($(uname_S),Darwin) + NEED_APPKIT = YesPlease + LIBNCURSES_IS_UNICODE = Yes NO_PKGCONFIG = Yes + ifndef NO_APPLE_GCC + APPLE_GCC = YesPlease + endif ifdef TILES EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL contrib/install/lib/libSDLmain.a BUILD_FREETYPE = YesPlease @@ -127,13 +132,6 @@ ifneq (,$(findstring CYGWIN,$(uname_S))) NO_RDYNAMIC = YesPlease BUILD_PCRE = YesPlease endif -ifeq ($(uname_S),Darwin) - ifndef NO_APPLE_GCC - APPLE_GCC = YesPlease - endif - NEED_APPKIT = YesPlease - LIBNCURSES_IS_UNICODE = Yes -endif # # Set up object file dependencies for $(GAME) target. -- cgit v1.2.3-54-g00ecf