summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-07-08 18:57:00 +0000
committerrubidium <rubidium@openttd.org>2007-07-08 18:57:00 +0000
commit101722039e44a4d09c5837e9e05adc7711afc05f (patch)
treeef398512df8ff4d1fd31945281a567de6f0e4990
parent165dd778afbb0f8181c14f5fca4d162311eb8922 (diff)
downloadopenttd-101722039e44a4d09c5837e9e05adc7711afc05f.tar.xz
(svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
-rw-r--r--config.lib7
1 files changed, 3 insertions, 4 deletions
diff --git a/config.lib b/config.lib
index 321e7aacd..be7f474a0 100644
--- a/config.lib
+++ b/config.lib
@@ -748,15 +748,14 @@ make_cflags_and_ldflags() {
OBJS_SUBDIR="release"
if [ "$os" = "OSX" ]; then
# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
- CFLAGS="$CFLAGS -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic"
+ CFLAGS="-O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic $CFLAGS"
else
if [ "$os" = "MORPHOS" ]; then
- CFLAGS="$CFLAGS -I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations"
- CFLAGS="$CFLAGS -mcpu=604 -fno-inline -mstring -mmultiple"
+ CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
LDFLAGS="$LDFLAGS -noixemul"
fi
- CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
+ CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
fi
else
OBJS_SUBDIR="debug"