cpp/openttd-patchpack/source Changeset - r7204:70390a15d0a6

Changeset - r7204:70390a15d0a6

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2007-07-08 18:57:00
rubidium@openttd.org

(svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.

1 file changed with 3 insertions and 4 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -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"

0 comments (0 inline, 0 general)