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

[bluddy at users.sourceforge.net]

Revision: 46239
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46239&view=rev
Author:   bluddy
Date:     2009-12-02 20:25:01 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
PSP: experiment to help resolve flicker bug

Modified Paths:
--------------
    scummvm/trunk/backends/platform/psp/main_prog.ld
    scummvm/trunk/backends/platform/psp/trace.cpp
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/platform/psp/main_prog.ld
===================================================================
--- scummvm/trunk/backends/platform/psp/main_prog.ld	2009-12-02 03:55:06 UTC (rev 46238)
+++ scummvm/trunk/backends/platform/psp/main_prog.ld	2009-12-02 20:25:01 UTC (rev 46239)
@@ -198,11 +198,15 @@
   __plugin_hole_start = .;
   . = _gp + 0x7ff0;
   __plugin_hole_end = .;
+  COMMON          :
+  {
+   *(COMMON)
+  }
+  . = ALIGN(32 / 8);
   .bss            :
   {
    *(.dynbss)
    *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
    /* Align here to ensure that the .bss section occupies space up to
       _end.  Align after .bss to ensure correct alignment even if the
       .bss section disappears because there are no input sections.  */

Modified: scummvm/trunk/backends/platform/psp/trace.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/trace.cpp	2009-12-02 03:55:06 UTC (rev 46238)
+++ scummvm/trunk/backends/platform/psp/trace.cpp	2009-12-02 20:25:01 UTC (rev 46239)
@@ -27,6 +27,7 @@
 #include "./trace.h"
 
 
+
 void PSPDebugTrace (const char *format, ...) {
 #ifdef __PSP_DEBUG__
 	va_list	opt;

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-12-02 03:55:06 UTC (rev 46238)
+++ scummvm/trunk/configure	2009-12-02 20:25:01 UTC (rev 46239)
@@ -1802,7 +1802,7 @@
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
 CXXFLAGS		+= -DDYNAMIC_MODULES
 LDFLAGS			+= -Wl,-T$(srcdir)/backends/platform/psp/main_prog.ld
-PLUGIN_LDFLAGS		= -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/psp/plugin.syms,-T$(srcdir)/backends/platform/psp/plugin.ld -lstdc++ -lc -lm -Wl,-Map,mapfile.txt
+PLUGIN_LDFLAGS		= -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/psp/plugin.syms,-T$(srcdir)/backends/platform/psp/plugin.ld -lstdc++ -lc -lm
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
 '
@@ -2312,7 +2312,7 @@
 	psp)
 		DEFINES="$DEFINES -D__PSP__ -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
 		INCLUDES="$INCLUDES -I$PSPDEV/psp/include/SDL"
-		LIBS="$LIBS -lpng -lSDL"
+		LIBS="$LIBS -lpng -lSDL -Wl,-Map,mapfile.txt"
 		SDLLIBS=$($PSPDEV/psp/bin/sdl-config --libs)
 		
 		if `echo "$SDLLIBS" | grep ".*-lGL.*" 1>/dev/null 2>&1`


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