diff options
| author | truelight <truelight@openttd.org> | 2006-05-27 17:51:11 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-05-27 17:51:11 +0000 |
| commit | 49526b594fc6586f86f4262a8f19f2f770785c10 (patch) | |
| tree | 88daa5d4a533dd8021a7900402d89593917712e8 /Makefile | |
| parent | 5e73dce0e71791b87e5b096a890578eefcc26639 (diff) | |
| download | openttd-49526b594fc6586f86f4262a8f19f2f770785c10.tar.xz | |
(svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 $<' |