aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJoost Peters2009-10-09 12:10:08 +0000
committerJoost Peters2009-10-09 12:10:08 +0000
commit7bf181bf98b5cdb38251efac681277015ceaf2d5 (patch)
tree47d3692e8cc8e45d09f111b8f61e3d5cc9084b84 /configure
parentce8addf5e04d07c6f27a3a35d241d6dc56eed936 (diff)
downloadscummvm-rg350-7bf181bf98b5cdb38251efac681277015ceaf2d5.tar.gz
scummvm-rg350-7bf181bf98b5cdb38251efac681277015ceaf2d5.tar.bz2
scummvm-rg350-7bf181bf98b5cdb38251efac681277015ceaf2d5.zip
Slightly modified version of patch #2875544: PSP plugins patch
svn-id: r44822
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure27
1 files changed, 24 insertions, 3 deletions
diff --git a/configure b/configure
index 1e21606a0e..8737f44ea9 100755
--- a/configure
+++ b/configure
@@ -952,8 +952,9 @@ wii | gamecube | nds)
fi
;;
psp)
- if test -z "$PSPDEV"; then
- echo "Please set PSPDEV in your environment. export PSPDEV=<path to psp toolchain>"
+ PSPSDK=$(psp-config --pspsdk-path)
+ if test -z "$PSPSDK"; then
+ echo "Please set the path to PSPSDK in your environment."
exit 1
fi
;;
@@ -1281,7 +1282,7 @@ case $_host_os in
DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
;;
psp)
- CXXFLAGS="$CXXFLAGS -O3 -G0 -I$PSPDEV/psp/sdk/include -D_PSP_FW_VERSION=150"
+ CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
;;
ps2)
# TODO ps2
@@ -1796,6 +1797,23 @@ PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--no-whole-archive
'
;;
+ psp)
+_def_plugin='
+#define PLUGIN_PREFIX ""
+#define PLUGIN_SUFFIX ".plg"
+'
+_mak_plugins='
+DYNAMIC_MODULES := 1
+PLUGIN_PREFIX :=
+PLUGIN_SUFFIX := .plg
+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
+PRE_OBJS_FLAGS := -Wl,--whole-archive
+POST_OBJS_FLAGS := -Wl,--no-whole-archive
+'
+ ;;
*)
_dynamic_modules=no
_mak_plugins=
@@ -2351,6 +2369,9 @@ _engines_built_static=""
_engines_built_dynamic=""
_engines_skipped=""
+echo "dynamic modules = $_dynamic_modules"
+echo "plugins default = $_plugins_default"
+
for engine in $_engines; do
if test "`get_engine_sub $engine`" = "no" ; then
# It's a main engine