summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-05-27 17:51:11 +0000
committertruelight <truelight@openttd.org>2006-05-27 17:51:11 +0000
commit49526b594fc6586f86f4262a8f19f2f770785c10 (patch)
tree88daa5d4a533dd8021a7900402d89593917712e8 /Makefile
parent5e73dce0e71791b87e5b096a890578eefcc26639 (diff)
downloadopenttd-49526b594fc6586f86f4262a8f19f2f770785c10.tar.xz
(svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 236ea2ca6..85659028f 100644
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,7 @@ LANG_ERRORS = >/dev/null 2>&1
endif
ifdef OSX
--include os/MacOSX/Makefile.setup
+-include os/macosx/Makefile.setup
endif
ifdef STATIC
@@ -853,7 +853,7 @@ $(ENDIAN_CHECK): endian_check.c
$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
-ifndef NATIVE_OSX
+ifndef MACOSX_BUILD
# OSX links in os/macosx/Makefile to handle universal binaries better
$(TTD): $(OBJS) $(MAKE_CONFIG)
@echo '===> Linking $@'
@@ -1048,7 +1048,7 @@ endif
$(Q)$(CC) $(OBJCFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
-ifndef NATIVE_OSX
+ifndef MACOSX_BUILD
# OSX uses os/macosx/Makefile to compile files
%.o: %.c $(MAKE_CONFIG)
@echo '===> Compiling $<'