diff options
| -rw-r--r-- | Makefile.new | 3 | ||||
| -rwxr-xr-x | configure | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.new b/Makefile.new index cb0014dbdb..6e01833ab1 100644 --- a/Makefile.new +++ b/Makefile.new @@ -17,7 +17,6 @@ CP := cp # Default compilation parameters. Normally don't edit these # ####################################################################### -CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas DEFINES := -DHAVE_CONFIG_H LDFLAGS := INCLUDES:= -I. -Icommon @@ -30,7 +29,7 @@ include config.mak # Uncomment this for stricter compile time code verification # CXXFLAGS+= -Wshadow -Werror -CXXFLAGS += $(OPTFLAGS) +CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS) ####################################################################### # Misc stuff - you should normally never have to edit this # @@ -22,7 +22,6 @@ TMPO=/tmp/scummvm-conf TMPC=${TMPO}.cpp TMPLOG=config.log -CFLAGS="" # default lib behaviour yes/no/auto _vorbis=auto @@ -254,11 +253,11 @@ if test "$cxx_verc_fail" = yes ; then fi # -# Do CFLAGS now we know the compiler version +# Do CXXFLAGS now we know the compiler version # if test "$_cxx_major" -ge "3" ; then - CFLAGS="$CFLAGS -ansi -W -Wno-unused-parameter" + CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter" fi; # @@ -536,7 +535,7 @@ cat > config.mak << EOF # -------- Generated by configure ----------- CXX := $CXX -OPTFLAGS := $CFLAGS +CXXFLAGS := $CXXFLAGS LIBS := $LIBS RANLIB := $_ranlib BACKEND := $_backend |