summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makefile
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-10-11 03:03:27 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-10-11 03:03:27 -0700
commit81bf1fb4e599df83978df40bd711f0d7c782ebe3 (patch)
tree0f029b90ab029f9449f5b42970a06583fc41c386 /crawl-ref/source/makefile
parent6cbf8553105b78a769cdaf87253c58eb11311695 (diff)
downloadcrawl-ref-81bf1fb4e599df83978df40bd711f0d7c782ebe3.tar.gz
crawl-ref-81bf1fb4e599df83978df40bd711f0d7c782ebe3.zip
makefile: use the Mac OS X compatibility level on TILES as on non-TILES builds
Whoops, I put the whole compatibility level thing into the TILES conditional. I meant for it to affect all Mac builds. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
-rw-r--r--crawl-ref/source/makefile25
1 files changed, 15 insertions, 10 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index a0b3882241..14549fbe7d 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -133,16 +133,6 @@ LIB := -L$(LUASRC) -l$(LUALIB) $(LIBDBM)
INCLUDES += -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
-#
-# Tiles build stuff
-#
-ifneq ($(TILES),n)
-
-RLTILES = rltiles
-
-EXTRA_FLAGS += -DUSE_TILE
-INCLUDES += -I$(RLTILES)
-
ifeq ($(OSNAME),MacOS)
# Compatibility level for Mac OS X
@@ -174,6 +164,21 @@ endif
CC = $(GCC) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)
CXX = $(GCXX) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)
+endif # MacOS
+
+
+#
+# Tiles build stuff
+#
+ifneq ($(TILES),n)
+
+RLTILES = rltiles
+
+EXTRA_FLAGS += -DUSE_TILE
+INCLUDES += -I$(RLTILES)
+
+ifeq ($(OSNAME),MacOS)
+
# Handle the tile build dependencies for Mac a bit
# differently than other platforms.