diff options
| m--------- | crawl-ref/source/contrib/sdl | 0 | ||||
| -rw-r--r-- | crawl-ref/source/makefile | 23 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 6 |
3 files changed, 18 insertions, 11 deletions
diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl -Subproject 3f73b93ed3062ca74d8306e35ee62c5f17d2810 +Subproject 2c4409bf2818e4da2ceb90cfe5c7551155db982 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) diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 3a1abb71ed..9a7fba479e 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -20,6 +20,9 @@ LDFLAGS += $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) ifneq (,$(findstring MINGW,$(uname_S))) LDFLAGS += -lgdi32 -lwinmm endif +ifeq ($(uname_S),Darwin) +LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL +endif # Attempt to use a full compiler name, to make # distcc builds work nicely. @@ -31,6 +34,9 @@ ifeq ($(shell which $(LMACH)gcc 2> /dev/null),) LMACH := endif CXX = $(LMACH)g++ +ifdef ARCHS +CXX += $(ARCHS) +endif DELETE = rm -f |