diff options
| author | Max Horn | 2002-12-09 13:38:01 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-09 13:38:01 +0000 |
| commit | 098b1d52ca7ad394eaee0481c6c43ed0234166f6 (patch) | |
| tree | 387525288eb73f5f7752270316590b962233d99a | |
| parent | 90b844d95e82f70e31bb59abf05252d86f5849ec (diff) | |
| download | scummvm-rg350-098b1d52ca7ad394eaee0481c6c43ed0234166f6.tar.gz scummvm-rg350-098b1d52ca7ad394eaee0481c6c43ed0234166f6.tar.bz2 scummvm-rg350-098b1d52ca7ad394eaee0481c6c43ed0234166f6.zip | |
change CFLAGS to CXXFLAGS
svn-id: r5896
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.common | 6 | ||||
| -rw-r--r-- | Makefile.mingw | 4 | ||||
| -rw-r--r-- | backends/dc/Makefile | 2 | ||||
| -rw-r--r-- | backends/gp32/build.rules | 2 | ||||
| -rw-r--r-- | backends/morphos/build.rules | 10 | ||||
| -rwxr-xr-x | dists/debian/rules | 2 |
7 files changed, 15 insertions, 15 deletions
@@ -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 ####################################################################### diff --git a/Makefile.common b/Makefile.common index 70000dc836..9391d445fa 100644 --- a/Makefile.common +++ b/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 diff --git a/Makefile.mingw b/Makefile.mingw index 3c04526889..11a074c6e6 100644 --- a/Makefile.mingw +++ b/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 # diff --git a/backends/dc/Makefile b/backends/dc/Makefile index 2dc9f8dd03..9a8595a95e 100644 --- a/backends/dc/Makefile +++ b/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 diff --git a/backends/gp32/build.rules b/backends/gp32/build.rules index 4c94b34a61..628c2f67fd 100644 --- a/backends/gp32/build.rules +++ b/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 \ diff --git a/backends/morphos/build.rules b/backends/morphos/build.rules index b1fa9185f3..eb0b290af4 100644 --- a/backends/morphos/build.rules +++ b/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 \ diff --git a/dists/debian/rules b/dists/debian/rules index 8bd7b6989b..769da061fd 100755 --- a/dists/debian/rules +++ b/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: |