diff options
| author | rubidium <rubidium@openttd.org> | 2007-07-08 18:57:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-07-08 18:57:00 +0000 |
| commit | 6baed14dfd422733015c3c6a0da6af7b052005d3 (patch) | |
| tree | ef398512df8ff4d1fd31945281a567de6f0e4990 | |
| parent | 44db9379296a5340471f6d34d7322f0f87301f7c (diff) | |
| download | openttd-6baed14dfd422733015c3c6a0da6af7b052005d3.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.lib | 7 |
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" |