From df24f1ef4ed2b8d0e6c5df6e1bfbbcb2fc86d2a8 Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Sun, 22 Oct 2006 14:53:30 +0000 Subject: [PATCH] don't set CFLAGS, as we don't need them and they're now used for building the 'tools' with the native C compiler svn-id: r24440 --- backends/platform/psp/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile index c6c06d4ff50..84e84e91483 100644 --- a/backends/platform/psp/Makefile +++ b/backends/platform/psp/Makefile @@ -35,27 +35,26 @@ endif INCDIR := $(srcdir) . $(srcdir)/engines/ . $(PSPSDK)/include LIBDIR := $(LIBDIR) . $(PSPSDK)/lib -CFLAGS = -O2 -Wall -D__PSP__ -DNONSTANDARD_PORT -DUSE_ZLIB -Wno-multichar `$(PSPBIN)/sdl-config --cflags` -CFLAGS := $(addprefix -I,$(INCDIR)) $(CFLAGS) +CXXFLAGS = -O2 -Wall -D__PSP__ -DNONSTANDARD_PORT -DUSE_ZLIB -Wno-multichar `$(PSPBIN)/sdl-config --cflags` +CXXFLAGS:= $(addprefix -I,$(INCDIR)) $(CXXFLAGS) LDFLAGS := $(addprefix -L,$(LIBDIR)) $(LDFLAGS) LIBS = #comment this out if you don't want to use libmad -CFLAGS += -DUSE_MAD +CXXFLAGS+= -DUSE_MAD LIBS += -lmad #comment this out if you don't want to use libtremor -CFLAGS += -DUSE_VORBIS -DUSE_TREMOR +CXXFLAGS+= -DUSE_VORBIS -DUSE_TREMOR LIBS += -lvorbisidec #comment this out if you don't want to use libmpeg2 -CFLAGS += -DUSE_MPEG2 +CXXFLAGS+= -DUSE_MPEG2 LIBS += -lmpeg2 LIBS += `$(PSPBIN)/sdl-config --libs` -lz -lstdc++ -lc -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpsputility -lpspsdk -lpspuser -CXXFLAGS := $(CFLAGS) $(CXXFLAGS) -fno-exceptions -fno-rtti -ASFLAGS := $(CFLAGS) $(ASFLAGS) +CXXFLAGS := $(CXXFLAGS) -fno-exceptions -fno-rtti TARGET = scummvm-psp OBJS := psp_main.o \