[Scummvm-cvs-logs] CVS: scummvm Makefile,1.24,1.25 Makefile.common,1.40,1.41 Makefile.mingw,1.9,1.10

[Max Horn]

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

Modified Files:
	Makefile Makefile.common Makefile.mingw 
Log Message:
change CFLAGS to CXXFLAGS

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	1 Dec 2002 20:29:19 -0000	1.24
+++ Makefile	9 Dec 2002 13:38:00 -0000	1.25
@@ -17,7 +17,7 @@
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################
 
-CFLAGS  := -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
 DEFINES :=
 LDFLAGS :=
 INCLUDES:= -I. -Icommon
@@ -48,7 +48,7 @@
 # LIBS    += -lasound
 
 # Uncomment this for stricter compile time code verification
-# CFLAGS  += -Wshadow -Werror
+# CXXFLAGS+= -Wshadow -Werror
 
 
 #######################################################################

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Makefile.common	26 Nov 2002 20:11:46 -0000	1.40
+++ Makefile.common	9 Dec 2002 13:38:00 -0000	1.41
@@ -41,7 +41,7 @@
 # Default (dumb) compile & dependcy rules
 #INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
 #.cpp.o:
-#	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 #$(OBJS): $(INCS)
 
 
@@ -52,7 +52,7 @@
 
 .cpp.o:
 	$(MKDIR) $(*D)/$(DEPDIR)
-	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 	$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
 	$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
 	$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
@@ -61,7 +61,7 @@
 # rule can get you into a bad state if you Ctrl-C it in the wrong moment.
 #.cpp.o:
 #	$(MKDIR) $(*D)/$(DEPDIR)
-#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
 -include $(DEPFILES) /dev/null
 

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.mingw,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.mingw	20 Nov 2002 18:05:02 -0000	1.9
+++ Makefile.mingw	9 Dec 2002 13:38:00 -0000	1.10
@@ -23,7 +23,7 @@
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################
 
-CFLAGS  := -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
 DEFINES :=
 LDFLAGS :=
 INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS)
@@ -48,7 +48,7 @@
 LIBS    += -lvorbisfile -lvorbis -logg
 
 # Uncomment this for stricter compile time code verification
-# CFLAGS  += -Wshadow -Werror
+# CXXFLAGS+= -Wshadow -Werror
 
 #######################################################################
 # Misc stuff - you should normally never have to edit this            #