refactored NEW_PLUGIN_DESIGN_FIRST_REFINEMENT define into ONE_PLUGIN_AT_A_TIME

svn-id: r52058

7 files changed, 10 insertions, 10 deletions

diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 75a2e68ec5..3f3c46b452 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -237,7 +237,7 @@ CXXFLAGS=	$(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder  \
 
 
 ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DARM -DARM_TARGET -DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DARM -DARM_TARGET -DONE_PLUGIN_AT_A_TIME
 ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
@@ -362,7 +362,7 @@ include $(srcdir)/Makefile.common
 semiclean:
 	$(RM) $(portdir)/source/dsoptions.o $(portdir)/source/dsmain.o $(FAT_OBJS) $(DATA_OBJS) $(portdir)/source/wordcompletion.o $(portdir)/source/dsoptions.o
 
-clean:
+clean: #TODO: Manual removal of engine, plugins, etc. isn't very elegant!
 	$(RM) $(OBJS) $(EXECUTABLE)
 	rm -rf *.h engines plugins graphics gui common sound backends base map.txt scummvm.nds scummvm.ds.gba
 
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index f836bd3eaa..53f9b51360 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -78,7 +78,7 @@ DEPDIR = .deps
 TARGET = elf/scummvm.elf
 
 DEFINES += -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions -DNO_ADAPTOR
-DEFINES += -DELF_LOADER_TARGET -DMIPS_TARGET#-DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT
+DEFINES += -DELF_LOADER_TARGET -DMIPS_TARGET#-DONE_PLUGIN_AT_A_TIME
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
diff --git a/backends/plugins/arm-loader.cpp b/backends/plugins/arm-loader.cpp
index d8ed083962..916516aed9 100644
--- a/backends/plugins/arm-loader.cpp
+++ b/backends/plugins/arm-loader.cpp
@@ -30,7 +30,7 @@
 #include "dsmain.h"
 #include "arm-loader.h"
 
-#define __DEBUG_PLUGINS__
+//#define __DEBUG_PLUGINS__
 
 #ifdef __DEBUG_PLUGINS__
 #define DBG(x,...) consolePrintf(x, ## __VA_ARGS__)
diff --git a/backends/plugins/mips-loader.cpp b/backends/plugins/mips-loader.cpp
index 7b59a2cffa..dfa2765cfa 100644
--- a/backends/plugins/mips-loader.cpp
+++ b/backends/plugins/mips-loader.cpp
@@ -27,7 +27,7 @@
 
 #include "mips-loader.h"
 
-#define __DEBUG_PLUGINS__
+//#define __DEBUG_PLUGINS__
 
 #ifdef __DEBUG_PLUGINS__
 #define DBG(x,...) printf(x, ## __VA_ARGS__)
diff --git a/base/main.cpp b/base/main.cpp
index 028f25dff2..17acf58266 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -106,7 +106,7 @@ static const EnginePlugin *detectPlugin() {
 	printf("User picked target '%s' (gameid '%s')...\n", ConfMan.getActiveDomainName().c_str(), gameid.c_str());
 	printf("%s", "  Looking for a plugin supporting this gameid... ");
 
-#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES)
+#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
 	GameDescriptor game = EngineMan.findGameOnePlugAtATime(gameid, &plugin);
 #else
  	GameDescriptor game = EngineMan.findGame(gameid, &plugin);
@@ -344,7 +344,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 		settings.erase("debugflags");
 	}
 
-#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES) //note: I'm going to refactor this name later :P
+#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
 	// Only load non-engine plugins and first engine plugin initially in this case.
 	PluginManager::instance().loadFirstPlugin(); //This should be the only call to loadFirstPlugin external to the PluginManager class.
 #else
diff --git a/base/plugins.cpp b/base/plugins.cpp
index aac18c4173..dfb1d85141 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -464,7 +464,7 @@ GameList EngineManager::detectGames(const Common::FSList &fslist) const {
 	GameList candidates;
 	EnginePlugin::List plugins;
 	EnginePlugin::List::const_iterator iter;
-#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES)
+#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
 	do {
 #endif
 		plugins = getPlugins();
@@ -473,7 +473,7 @@ GameList EngineManager::detectGames(const Common::FSList &fslist) const {
 		for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
 			candidates.push_back((**iter)->detectGames(fslist));
 		}
-#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES)
+#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
 	} while (PluginManager::instance().loadNextPlugin());
 #endif
 	return candidates;
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index bc5debd9cd..ae91ae3a57 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -875,7 +875,7 @@ void LauncherDialog::loadGame(int item) {
 
 	const EnginePlugin *plugin = 0;
 	
-#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES)
+#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
 	EngineMan.findGameOnePlugAtATime(gameId, &plugin);
 #else
 	EngineMan.findGame(gameId, &plugin);