[Scummvm-cvs-logs] CVS: scummvm/backends/psp Makefile,1.3,1.4

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/backends/psp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9350

Modified Files:
	Makefile 
Log Message:
fixup imports, needed when using a recent pspsdk
use gcc instead of g++ for linking, to avoid re-ordering of link libraries



Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/psp/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	17 Sep 2005 10:29:35 -0000	1.3
+++ Makefile	30 Sep 2005 23:13:25 -0000	1.4
@@ -16,7 +16,7 @@
 
 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 @@
 RM 	= rm -f
 MKSFO	= mksfo
 PACK_PBP = pack-pbp
+FIXUP	= psp-fixup-imports
 
 INCDIR = ../../
 
@@ -53,8 +54,7 @@
 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 @@
 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)