diff options
| author | Joost Peters | 2005-09-30 23:13:25 +0000 |
|---|---|---|
| committer | Joost Peters | 2005-09-30 23:13:25 +0000 |
| commit | 7242cdc97392702829d294a805baaad15e0e184d (patch) | |
| tree | b027ef97512e0f8129ea559bf5d4e9e482da9180 /backends/psp/Makefile | |
| parent | b7a275a131de30bad41f29884c90ad8eda6585ba (diff) | |
| download | scummvm-rg350-7242cdc97392702829d294a805baaad15e0e184d.tar.gz scummvm-rg350-7242cdc97392702829d294a805baaad15e0e184d.tar.bz2 scummvm-rg350-7242cdc97392702829d294a805baaad15e0e184d.zip | |
fixup imports, needed when using a recent pspsdk
use gcc instead of g++ for linking, to avoid re-ordering of link libraries
svn-id: r18911
Diffstat (limited to 'backends/psp/Makefile')
| -rw-r--r-- | backends/psp/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/backends/psp/Makefile b/backends/psp/Makefile index d1ba1b8586..782f270778 100644 --- a/backends/psp/Makefile +++ b/backends/psp/Makefile @@ -16,7 +16,7 @@ LDFLAGS = CXX = psp-g++ AS = psp-gcc -LD = psp-g++ +LD = psp-gcc AR = psp-ar cru RANLIB = psp-ranlib STRIP = psp-strip @@ -24,6 +24,7 @@ MKDIR = mkdir -p RM = rm -f MKSFO = mksfo PACK_PBP = pack-pbp +FIXUP = psp-fixup-imports INCDIR = ../../ @@ -53,8 +54,7 @@ LIBS += -lvorbisidec CFLAGS += -DUSE_MPEG2 LIBS += -lmpeg2 -LIBS += -lz -lm `$(PSPBIN)/sdl-config --libs` -lc -lpspgu -lpspctrl -lpspkernel -lpspuser - +LIBS += `$(PSPBIN)/sdl-config --libs` -lz -lstdc++ -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lc -lpspuser -lpspkernel CXXFLAGS := $(CFLAGS) $(CXXFLAGS) -fno-exceptions -fno-rtti ASFLAGS := $(CFLAGS) $(ASFLAGS) @@ -87,13 +87,14 @@ PSP_EBOOT_PSAR = NULL all: $(PSP_EBOOT) $(TARGET).elf: $(OBJS) - $(LINK.cpp) $(OBJS) $(LIBS) -o $@ - $(STRIP) $@ + $(LD) $^ $(LIBS) -o $@ + $(FIXUP) $@ $(PSP_EBOOT_SFO): $(MKSFO) '$(PSP_EBOOT_TITLE)' $@ $(PSP_EBOOT): $(TARGET).elf $(PSP_EBOOT_SFO) + $(STRIP) $(TARGET).elf $(PACK_PBP) $@ $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) $(PSP_EBOOT_ICON1) \ $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) $(PSP_EBOOT_SND0) \ $(TARGET).elf $(PSP_EBOOT_PSAR) |