aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorYotam Barnoy2010-11-01 06:31:09 +0000
committerYotam Barnoy2010-11-01 06:31:09 +0000
commit27182f266f48a6d55dd5d830ed19e2c4285ac1ba (patch)
tree052cdb73f28c31383e2c297e8c01c9612eaf249a /configure
parent94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1 (diff)
downloadscummvm-rg350-27182f266f48a6d55dd5d830ed19e2c4285ac1ba.tar.gz
scummvm-rg350-27182f266f48a6d55dd5d830ed19e2c4285ac1ba.tar.bz2
scummvm-rg350-27182f266f48a6d55dd5d830ed19e2c4285ac1ba.zip
PSP: removed CXA_AT_EXIT. It didn't work well because __dso_object already exists in the main executable, causing it not to be built in the plugins.
svn-id: r53996
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index bce4e65933..90e45170e4 100755
--- a/configure
+++ b/configure
@@ -1577,7 +1577,7 @@ case $_host_os in
;;
psp)
CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
- CXXFLAGS="$CXXFLAGS -fuse-cxa-atexit"
+ CXXFLAGS="$CXXFLAGS"
;;
solaris*)
DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
@@ -2225,10 +2225,10 @@ PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-T$(srcdir)/backend
;;
psp)
_elf_loader=yes
- DEFINES="$DEFINES -DMIPS_TARGET -DELF_LOADER_CXA_ATEXIT"
+ DEFINES="$DEFINES -DMIPS_TARGET"
_mak_plugins='
LDFLAGS += -Wl,-T$(srcdir)/backends/platform/psp/main_prog.ld
-PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lc
+PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc
'
;;
*)