[Scummvm-cvs-logs] SF.net SVN: scummvm:[55064] scummvm/trunk

[Bluddy at users.sourceforge.net]

Revision: 55064
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55064&view=rev
Author:   Bluddy
Date:     2010-12-30 08:01:58 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
PLUGINS: rename ONE_PLUGIN_AT_A_TIME define to UNCACHED_PLUGINS

ONE_PLUGIN_AT_A_TIME is too long.

Modified Paths:
--------------
    scummvm/trunk/backends/plugins/elf/elf-provider.cpp
    scummvm/trunk/base/main.cpp
    scummvm/trunk/base/plugins.cpp
    scummvm/trunk/configure

Property Changed:
----------------
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/plugins/elf/elf-provider.cpp
===================================================================
--- scummvm/trunk/backends/plugins/elf/elf-provider.cpp	2010-12-29 19:33:49 UTC (rev 55063)
+++ scummvm/trunk/backends/plugins/elf/elf-provider.cpp	2010-12-30 08:01:58 UTC (rev 55064)
@@ -183,7 +183,7 @@
 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) {

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2010-12-29 19:33:49 UTC (rev 55063)
+++ scummvm/trunk/base/main.cpp	2010-12-30 08:01:58 UTC (rev 55064)
@@ -423,7 +423,7 @@
 			// 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

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2010-12-29 19:33:49 UTC (rev 55063)
+++ scummvm/trunk/base/plugins.cpp	2010-12-30 08:01:58 UTC (rev 55064)
@@ -306,7 +306,7 @@
 	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();

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-12-29 19:33:49 UTC (rev 55063)
+++ scummvm/trunk/configure	2010-12-30 08:01:58 UTC (rev 55064)
@@ -2148,7 +2148,7 @@
 		;;
 	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 @@
 		;;
 	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 @@
 		;;
 	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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.