change CFLAGS to CXXFLAGS

svn-id: r5896

Makefile

@@ -17,7 +17,7 @@ CP  = cp
 # 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    += -lmad
 # LIBS    += -lasound
 
 # Uncomment this for stricter compile time code verification
-# CFLAGS  += -Wshadow -Werror
+# CXXFLAGS+= -Wshadow -Werror
 
 
 #######################################################################

Makefile.common

@@ -41,7 +41,7 @@ clean:
 # 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 @@ DEPFILES = $(wildcard $(patsubst %,%/*.d,$(DEPDIRS)))
 
 .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 @@ DEPFILES = $(wildcard $(patsubst %,%/*.d,$(DEPDIRS)))
 # 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
 

Makefile.mingw

@@ -23,7 +23,7 @@ CP  = cp
 # 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 @@ DEFINES += -DUSE_VORBIS
 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            #

backends/dc/Makefile

@@ -5,7 +5,7 @@ ronindir = /usr/local/ronin
 VPATH = ../..
 
 CXX     = sh-elf-g++ -ml -m4-single-only
-CFLAGS  = -O1 -Wno-multichar
+CXXFLAGS= -O1 -Wno-multichar
 DEFINES = -D__DC__ -DNONSTANDARD_PORT -DNONSTANDARD_SAVE
 LDFLAGS := -Wl,-Ttext,0x8c010000 -nostartfiles ronin/crt0.o
 INCLUDES:= -I./ -I../.. -I../../common

backends/gp32/build.rules

@@ -6,7 +6,7 @@
 CCBASE=c:/devkitadv
 
 CXX     =	$(CCBASE)/bin/g++
-CFLAGS  =	-mcpu=arm9tdmi \
+CXXFLAGS=	-mcpu=arm9tdmi \
 		-mtune=arm9tdmi \
 		-mapcs \
 		-O2 \

backends/morphos/build.rules

@@ -1,8 +1,8 @@
-CXX     = g++
-CFLAGS  = -Wno-multichar -fstrength-reduce -fno-rtti -O2
-DEFINES = -DNDEBUG
-LDFLAGS = -noixemul -s
-LIBS	= -lamiga -lamigastubs -lcdda -lcybergraphics
+CXX      = g++
+CXXFLAGS = -Wno-multichar -fstrength-reduce -fno-rtti -O2
+DEFINES  = -DNDEBUG
+LDFLAGS  = -noixemul -s
+LIBS	 = -lamiga -lamigastubs -lcdda -lcybergraphics
 INCLUDES += -Ibackends/morphos
 MODULES  += backends/morphos
 OBJS	 += backends/morphos/morphos.o backends/morphos/morphos_scaler.o \

dists/debian/rules

@@ -3,7 +3,7 @@
 export DH_COMPAT=3
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	export CFLAGS += -g
+	export CXXFLAGS += -g
 endif
 
 build: