summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-09-08 20:00:19 +0000
committerbjarni <bjarni@openttd.org>2006-09-08 20:00:19 +0000
commit2cb9350c405a71bc0254fb1c9907afa3310167d8 (patch)
treea78cd3c6058b84948770d6a7426d5e60c719283b /os
parented7cecb5cf3c8edb7f2951b806898b878e4fa938 (diff)
downloadopenttd-2cb9350c405a71bc0254fb1c9907afa3310167d8.tar.xz
(svn r6432) -Fix r4987: [OSX] added CCFLAGS to OSX targets as well
Diffstat (limited to 'os')
-rw-r--r--os/macosx/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index c788e6def..4526c4803 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -66,7 +66,7 @@ $(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970)
# targets to compile each c, m and cpp file
.OSX/%.o.ppc: %.c .deps/%.d
@echo '[PowerPC] Compiling $<'
- $(Q)$(CC_PPC) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
+ $(Q)$(CC_PPC) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
.OSX/%.o.ppc: %.cpp .deps/%.d
@echo '[PowerPC] Compiling $<'
@@ -74,11 +74,11 @@ $(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970)
.OSX/%.o.ppc: %.m .deps/%.d
@echo '[PowerPC] Compiling $<'
- $(Q)$(CC_PPC) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
+ $(Q)$(CC_PPC) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
.OSX/%.o.i386: %.c .deps/%.d
@echo '[i386] Compiling $<'
- $(Q)$(CC_I386) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
+ $(Q)$(CC_I386) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
.OSX/%.o.i386: %.cpp .deps/%.d
@echo '[i386] Compiling $<'
@@ -86,11 +86,11 @@ $(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970)
.OSX/%.o.i386: %.m .deps/%.d
@echo '[i386] Compiling $<'
- $(Q)$(CC_I386) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
+ $(Q)$(CC_I386) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
.OSX/%.o.ppc970: %.c .deps/%.d
@echo '[PowerPC G5] Compiling $<'
- $(Q)$(CC_PPC970) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
+ $(Q)$(CC_PPC970) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
.OSX/%.o.ppc970: %.cpp .deps/%.d
@echo '[PowerPC G5] Compiling $<'
@@ -98,7 +98,7 @@ $(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970)
.OSX/%.o.ppc970: %.m .deps/%.d
@echo '[PowerPC G5] Compiling $<'
- $(Q)$(CC_PPC970) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
+ $(Q)$(CC_PPC970) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
endif