Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

don't set CFLAGS, as they're now used for building the 'tools' with t…

…he native C compiler

svn-id: r24424
  • Loading branch information...
commit 1107b5ef6b16baea8fb8690696e69e90a2d80ce7 1 parent feded71
Joost Peters joostp authored
Showing with 6 additions and 7 deletions.
  1. +6 −7 backends/psp/Makefile
13 backends/psp/Makefile
View
@@ -38,27 +38,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 \
Please sign in to comment.
Something went wrong with that request. Please try again.