diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-20 07:45:25 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-20 07:46:15 -0700 |
| commit | dd65128ada0a1e92cebe85f5353113a8427ab043 (patch) | |
| tree | fdaa9dac97571ac3c341cc39d19d750a9b20f069 /crawl-ref/source/rltiles/makefile.unix | |
| parent | 04c97e69cec9eab5c5e2e7be4011b02318ff0384 (diff) | |
| download | crawl-ref-dd65128ada0a1e92cebe85f5353113a8427ab043.tar.gz crawl-ref-dd65128ada0a1e92cebe85f5353113a8427ab043.zip | |
Xcode: upgrade to SDL 1.2.14, SDL_image 1.2.8, add support for x86_64
Woohoo! Finally!
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 | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index a310afc4ce..85ecf07f4d 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -1,23 +1,4 @@ -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 - -PNG_CFLAGS := -I/Library/Frameworks/libpng.framework/Headers -PNG_LDFLAGS := -framework libpng - -CFLAGS := -F/Library/Frameworks $(SDL_CFLAGS) $(PNG_CFLAGS) -LDFLAGS := -F/Library/Frameworks $(SDL_LDFLAGS) $(PNG_LDFLAGS) - -else - SDLCONFIG := $(shell which sdl-config 2> /dev/null) ifeq ($(SDLCONFIG),) SDLCONFIG := $(shell pwd)/../contrib/install/bin/sdl-config @@ -32,8 +13,6 @@ PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "-lpng -lz") CFLAGS := $(SDL_CFLAGS) $(PNG_INCLUDE) LDFLAGS := $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) -endif - # Attempt to use a full compiler name, to make # distcc builds work nicely. LMACH := $(shell gcc -dumpmachine)- |