aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYotam Barnoy2010-12-30 08:01:58 +0000
committerYotam Barnoy2010-12-30 08:01:58 +0000
commit7558331550b98643f2c5ff72034b920214c899e1 (patch)
tree2fcea0147147e3f67f7e255d2cfa752c51df7d87
parent6c9a4d36ec3171cfc16f4ed7cd767a462bda87a7 (diff)
downloadscummvm-rg350-7558331550b98643f2c5ff72034b920214c899e1.tar.gz
scummvm-rg350-7558331550b98643f2c5ff72034b920214c899e1.tar.bz2
scummvm-rg350-7558331550b98643f2c5ff72034b920214c899e1.zip
PLUGINS: rename ONE_PLUGIN_AT_A_TIME define to UNCACHED_PLUGINS
ONE_PLUGIN_AT_A_TIME is too long. svn-id: r55064
-rw-r--r--backends/plugins/elf/elf-provider.cpp2
-rw-r--r--base/main.cpp2
-rw-r--r--base/plugins.cpp2
-rwxr-xr-xconfigure6
4 files changed, 6 insertions, 6 deletions
diff --git a/backends/plugins/elf/elf-provider.cpp b/backends/plugins/elf/elf-provider.cpp
index 393010fd6f..084f5eace7 100644
--- a/backends/plugins/elf/elf-provider.cpp
+++ b/backends/plugins/elf/elf-provider.cpp
@@ -183,7 +183,7 @@ void ELFPlugin::unloadPlugin() {
PluginList ELFPluginProvider::getPlugins() {
PluginList pl = FilePluginProvider::getPlugins();
-#if defined(ONE_PLUGIN_AT_A_TIME) && !defined(ELF_NO_MEM_MANAGER)
+#if defined(UNCACHED_PLUGINS) && !defined(ELF_NO_MEM_MANAGER)
// This static downcast is safe because all of the plugins must
// be ELF plugins
for (PluginList::iterator p = pl.begin(); p != pl.end(); ++p) {
diff --git a/base/main.cpp b/base/main.cpp
index 5024ec183c..2c432c1af9 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -423,7 +423,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// Try to run the game
Common::Error result = runGame(plugin, system, specialDebug);
- #if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
+ #if defined(UNCACHED_PLUGINS) && defined(DYNAMIC_MODULES)
// do our best to prevent fragmentation by unloading as soon as we can
PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, NULL, false);
// reallocate the config manager to get rid of any fragmentation
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 0e8a081016..a46ebe8748 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -306,7 +306,7 @@ PluginManager &PluginManager::instance() {
if (_instance)
return *_instance;
-#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
+#if defined(UNCACHED_PLUGINS) && defined(DYNAMIC_MODULES)
_instance = new PluginManagerUncached();
#else
_instance = new PluginManager();
diff --git a/configure b/configure
index fc44b189ae..19cca71a22 100755
--- a/configure
+++ b/configure
@@ -2148,7 +2148,7 @@ POST_OBJS_FLAGS := -Wl,--no-whole-archive
;;
ds)
_elf_loader=yes
- DEFINES="$DEFINES -DARM_TARGET -DELF_LOADER_CXA_ATEXIT -DONE_PLUGIN_AT_A_TIME -DELF_NO_MEM_MANAGER"
+ DEFINES="$DEFINES -DARM_TARGET -DELF_LOADER_CXA_ATEXIT -DUNCACHED_PLUGINS -DELF_NO_MEM_MANAGER"
_mak_plugins='
PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwork -mno-fpu
'
@@ -2172,7 +2172,7 @@ POST_OBJS_FLAGS := -Wl,-no-whole-archive
;;
gamecube | wii)
_elf_loader=yes
- DEFINES="$DEFINES -DPPC_TARGET -DELF_LOADER_CXA_ATEXIT -DONE_PLUGIN_AT_A_TIME"
+ DEFINES="$DEFINES -DPPC_TARGET -DELF_LOADER_CXA_ATEXIT -DUNCACHED_PLUGINS"
_mak_plugins='
PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/wii/plugin.ld
'
@@ -2239,7 +2239,7 @@ PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-T$(srcdir)/backend
;;
psp)
_elf_loader=yes
- DEFINES="$DEFINES -DMIPS_TARGET -DONE_PLUGIN_AT_A_TIME"
+ DEFINES="$DEFINES -DMIPS_TARGET -DUNCACHED_PLUGINS"
_mak_plugins='
LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/main_prog.ld
PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc