[Scummvm-cvs-logs] SF.net SVN: scummvm:[46134] scummvm/trunk

[joostp at users.sourceforge.net]

Revision: 46134
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46134&view=rev
Author:   joostp
Date:     2009-11-25 00:22:38 +0000 (Wed, 25 Nov 2009)

Log Message:
-----------
apply patch #2903175: "PSP: compile cleanup/fix for gprof and Windows"

Modified Paths:
--------------
    scummvm/trunk/backends/platform/psp/Makefile
    scummvm/trunk/backends/platform/psp/psp.spec
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/platform/psp/Makefile
===================================================================
--- scummvm/trunk/backends/platform/psp/Makefile	2009-11-24 23:34:03 UTC (rev 46133)
+++ scummvm/trunk/backends/platform/psp/Makefile	2009-11-25 00:22:38 UTC (rev 46134)
@@ -128,7 +128,7 @@
 
 # Add in PSPSDK includes and libraries.
 CXXFLAGS += $(SDLFLAGS)
-LIBS     += -lpng -lz -lstdc++ -lc $(SDLLIBS) $(PSPLIBS)
+LIBS     += -lpng -lSDL -lz $(findstring -lGL,$(SDLLIBS)) -lstdc++ -lc -lm $(filter -L%,$(SDLLIBS)) $(PSPLIBS)
 
 OBJS := powerman.o \
 	psp_main.o \

Modified: scummvm/trunk/backends/platform/psp/psp.spec
===================================================================
--- scummvm/trunk/backends/platform/psp/psp.spec	2009-11-24 23:34:03 UTC (rev 46133)
+++ scummvm/trunk/backends/platform/psp/psp.spec	2009-11-25 00:22:38 UTC (rev 46134)
@@ -1,3 +1,3 @@
 %rename lib	old_lib
 *lib:
-%(old_lib) -lpspdebug -lpspgu -lpspctrl -lpspge -lpspdisplay -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lc -lpspuser -lpsputility -lpspkernel -lpspnet_inet -lz -lstdc++ -lc -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpsputility -lpspuser -lpsppower 
+%(old_lib) -lz -lstdc++ -lc -lm -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-11-24 23:34:03 UTC (rev 46133)
+++ scummvm/trunk/configure	2009-11-25 00:22:38 UTC (rev 46134)
@@ -900,6 +900,12 @@
 	_host_os=psp
 	_host_cpu=mipsallegrexel
 	_host_alias=psp
+	if test -z "$PSPDEV"; then
+		PSPDEV=$(psp-config --pspdev-path)
+	fi
+	if test -d "$PSPDEV/psp/lib"; then
+		LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
+	fi
 	LDFLAGS="$LDFLAGS -L$PSPDEV/psp/sdk/lib -specs=$_srcdir/backends/platform/psp/psp.spec"
 	;;
 ps2)
@@ -2307,6 +2313,12 @@
 		DEFINES="$DEFINES -D__PSP__ -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
 		INCLUDES="$INCLUDES -I$PSPDEV/psp/include/SDL"
 		LIBS="$LIBS -lpng -lSDL"
+		SDLLIBS=$($PSPDEV/psp/bin/sdl-config --libs)
+		
+		if `echo "$SDLLIBS" | grep ".*-lGL.*" 1>/dev/null 2>&1`
+		then
+			LIBS="$LIBS -lGL"
+		fi
 		;;
 	ps2)
 		# TODO ps2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.