diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-11-06 19:59:12 -0800 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-11-06 21:02:21 -0800 |
| commit | 515f957a67b0794aab7e05db9b0b8fbc1e09b318 (patch) | |
| tree | 7a20e6e4c4e576391c6d72830ca9a8a8dc1a5832 | |
| parent | 35c879c6f74266b4d698dbb6f4709a67a0a6367b (diff) | |
| download | crawl-ref-515f957a67b0794aab7e05db9b0b8fbc1e09b318.tar.gz crawl-ref-515f957a67b0794aab7e05db9b0b8fbc1e09b318.zip | |
makefile: unify two Darwin-specific sections
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| -rw-r--r-- | crawl-ref/source/makefile | 12 |
1 files 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. |