diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-12 01:57:35 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-12 03:57:37 -0700 |
| commit | 4b1ee0b9169dca86bd02c97f5771603aa5820ad8 (patch) | |
| tree | 2ad10b1e4c5ad330fbd6a67cfc5864e8a8c2aa86 /crawl-ref/source/rltiles/makefile.unix | |
| parent | e1efdcdfac2f7be3a5b1bb0e28a9d08bb98fd144 (diff) | |
| download | crawl-ref-4b1ee0b9169dca86bd02c97f5771603aa5820ad8.tar.gz crawl-ref-4b1ee0b9169dca86bd02c97f5771603aa5820ad8.zip | |
makefiles: add APPLE_GCC option, to enable or disable use of Apple's GCC
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/rltiles/makefile.unix')
| -rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 0d35c801ff..b64c673966 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -1,5 +1,12 @@ -ifeq ($(shell uname -s),Darwin) +ifeq ($(OSNAME),MacOS) +APPLE_GCC=y +else +APPLE_GCC=n +endif + +ifneq ($(APPLE_GCC),n) + SDL_CFLAGS := -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers SDL_LDFLAGS := -framework SDL -framework SDL_image @@ -9,9 +16,6 @@ PNG_LDFLAGS := -framework libpng CFLAGS := -F/Library/Frameworks $(SDL_CFLAGS) $(PNG_CFLAGS) LDFLAGS := -F/Library/Frameworks $(SDL_LDFLAGS) $(PNG_LDFLAGS) -# FIXME: We need 32-bit until SDL 1.2.14 comes out -CXX ?= g++ -m32 - else SDL_CFLAGS := $(shell sdl-config --cflags) @@ -23,10 +27,10 @@ PNG_LIB := $(shell pkg-config libpng --libs) CFLAGS := $(SDL_CFLAGS) $(PNG_INCLUDE) LDFLAGS := $(SDL_LDFLAGS) $(PNGLIB) -lSDL_image -lpng -CXX ?= g++ - endif +CXX = g++ + DELETE = rm -f TOOLDIR := tool |