[Scummvm-cvs-logs] CVS: scummvm Makefile.new,1.5,1.6 configure,1.32,1.33

Jonathan Gray khalek at users.sourceforge.net
Mon Jul 28 04:47:09 CEST 2003


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv25346

Modified Files:
	Makefile.new configure 
Log Message:
correct cflags variables

Index: Makefile.new
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.new,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.new	6 Jul 2003 02:40:02 -0000	1.5
+++ Makefile.new	28 Jul 2003 11:46:30 -0000	1.6
@@ -17,7 +17,6 @@
 # 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 @@
 # 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            #

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- configure	28 Jul 2003 02:12:59 -0000	1.32
+++ configure	28 Jul 2003 11:46:32 -0000	1.33
@@ -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 @@
 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 @@
 # -------- Generated by configure -----------
 
 CXX := $CXX
-OPTFLAGS := $CFLAGS
+CXXFLAGS := $CXXFLAGS
 LIBS := $LIBS
 RANLIB := $_ranlib
 BACKEND := $_backend





More information about the Scummvm-git-logs mailing list