diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-26 00:25:40 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-26 00:28:15 -0700 |
| commit | 018d932591b3d20b9bc7bc808706707a88233bb4 (patch) | |
| tree | f02f39b1b6deff19061126f919b3091cd131f863 /crawl-ref/source/makefile | |
| parent | ef7e9ee25690eedce4f0d101a93df16d0994a139 (diff) | |
| download | crawl-ref-018d932591b3d20b9bc7bc808706707a88233bb4.tar.gz crawl-ref-018d932591b3d20b9bc7bc808706707a88233bb4.zip | |
makefiles: add support for command-line builds of Mac Tiles executables
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 517d326ae8..b6d8dee368 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -102,6 +102,17 @@ ifneq (,$(findstring MINGW,$(uname_S))) BUILD_ZLIB = YesPlease endif endif +ifeq ($(uname_S),Darwin) + NO_PKGCONFIG = Yes + ifdef TILES + EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL contrib/install/lib/libSDLmain.a + BUILD_FREETYPE = YesPlease + BUILD_SDL = YesPlease + BUILD_SDLIMAGE = YesPlease + BUILD_LIBPNG = YesPlease + BUILD_ZLIB = YesPlease + endif +endif ifneq (,$(findstring CYGWIN,$(uname_S))) GAME = crawl.exe NO_RDYNAMIC = YesPlease @@ -188,6 +199,7 @@ GCC_VER := 4.0 # SDL 1.2.14 is available # ARCHS := -arch i386 +export ARCHS # Mac OS X 10.4 adds a 'u' on the end of the SDK name. Everything # else is much easier to predict the name of. @@ -258,17 +270,6 @@ RLTILES = rltiles # ifdef TILES -ifeq ($(uname_S),Darwin) -ifndef UNSUPPORTED_BUILD -$(warning Using this makefile to build a tiles build on Mac OS X is NOT OFFICIALLY SUPPORTED.) -$(warning You should have no expectation of stability if you choose to continue anyway!) -$(warning Please use the Xcode project instead.) -$(error To build anyway, add the flag UNSUPPORTED_BUILD=y to the command-line) -else -EXTRA_LIBS += -framework OpenGL -framework AppKit -endif -endif - DEFINES_L += -DUSE_TILE INCLUDES_L += -I$(RLTILES) |