diff options
| author | Max Horn | 2011-05-05 14:14:21 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-25 13:21:53 +0200 |
| commit | d935c53cdf00a54d95714139046abc35bf5c2c6a (patch) | |
| tree | 74ad13661fdb37bdccee5f330602669e3f381e9f /configure | |
| parent | 9b14c50b774afe0d257534e261f412455d8ed93e (diff) | |
| download | scummvm-rg350-d935c53cdf00a54d95714139046abc35bf5c2c6a.tar.gz scummvm-rg350-d935c53cdf00a54d95714139046abc35bf5c2c6a.tar.bz2 scummvm-rg350-d935c53cdf00a54d95714139046abc35bf5c2c6a.zip | |
BUILD: Rearrange some PSP stuff
Cursory testing shows no regressions caused by this, but proper
testing of this change is recommended.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -1073,13 +1073,6 @@ psp) _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" ;; samsungtv) _host_os=linux @@ -1216,9 +1209,15 @@ ps2) fi ;; psp) - PSPSDK=`psp-config --pspsdk-path` + if test -z "$PSPDEV"; then + PSPDEV=`psp-config --pspdev-path` + fi + # TODO: Should we also insist on a valid PSPDEV value? if test -z "$PSPSDK"; then - echo "Please set the path to PSPSDK in your environment." + PSPSDK=`psp-config --pspsdk-path` + fi + if test -z "$PSPSDK"; then + echo "Please set PSPSDK in your environment. export PSPSDK=<path to psp sdk>" exit 1 fi ;; @@ -1660,6 +1659,10 @@ case $_host_os in DEFINES="$DEFINES -D_EE -D__PLAYSTATION2__" ;; psp) + if test -d "$PSPDEV/psp/lib"; then + LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib" + fi + LDFLAGS="$LDFLAGS -L$PSPSDK/lib -specs=$_srcdir/backends/platform/psp/psp.spec" CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150" ;; solaris*) |