Ticket #9114: patch.diff

File patch.diff, 2.0 KB (added by bluddy, 14 years ago)
  • configure

     
    900900        _host_os=psp
    901901        _host_cpu=mipsallegrexel
    902902        _host_alias=psp
     903        if test -z "$PSPDEV"; then
     904                PSPDEV=$(psp-config --pspdev-path)
     905        fi
     906        if test -d "$PSPDEV/psp/lib"; then
     907                LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
     908        fi
    903909        LDFLAGS="$LDFLAGS -L$PSPDEV/psp/sdk/lib -specs=$_srcdir/backends/platform/psp/psp.spec"
    904910        ;;
    905911ps2)
     
    23072313                DEFINES="$DEFINES -D__PSP__ -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
    23082314                INCLUDES="$INCLUDES -I$PSPDEV/psp/include/SDL"
    23092315                LIBS="$LIBS -lpng -lSDL"
     2316                SDLLIBS=$($PSPDEV/psp/bin/sdl-config --libs)
     2317               
     2318                if `echo "$SDLLIBS" | grep ".*-lGL.*" 1>/dev/null 2>&1`
     2319                then
     2320                        LIBS="$LIBS -lGL"
     2321                fi
    23102322                ;;
    23112323        ps2)
    23122324                # TODO ps2
  • backends/platform/psp/psp.spec

     
    11%rename lib     old_lib
    22*lib:
    3 %(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
     3%(old_lib) -lz -lstdc++ -lc -lm -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio
  • backends/platform/psp/Makefile

     
    128128
    129129# Add in PSPSDK includes and libraries.
    130130CXXFLAGS += $(SDLFLAGS)
    131 LIBS     += -lpng -lz -lstdc++ -lc $(SDLLIBS) $(PSPLIBS) 
     131LIBS     += -lpng -lSDL -lz $(findstring -lGL,$(SDLLIBS)) -lstdc++ -lc -lm $(filter -L%,$(SDLLIBS)) $(PSPLIBS) 
    132132
    133133OBJS := powerman.o \
    134134        psp_main.o \