[Scummvm-cvs-logs] SF.net SVN: scummvm:[52058] scummvm/branches/gsoc2010-plugins

toneman1138 at users.sourceforge.net toneman1138 at users.sourceforge.net
Fri Aug 13 07:58:12 CEST 2010


Revision: 52058
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52058&view=rev
Author:   toneman1138
Date:     2010-08-13 05:58:11 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
refactored NEW_PLUGIN_DESIGN_FIRST_REFINEMENT define into ONE_PLUGIN_AT_A_TIME

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
    scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
    scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.cpp
    scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.cpp
    scummvm/branches/gsoc2010-plugins/base/main.cpp
    scummvm/branches/gsoc2010-plugins/base/plugins.cpp
    scummvm/branches/gsoc2010-plugins/gui/launcher.cpp

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-08-13 05:58:11 UTC (rev 52058)
@@ -237,7 +237,7 @@
 
 
 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 @@
 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
 

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-08-13 05:58:11 UTC (rev 52058)
@@ -78,7 +78,7 @@
 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

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.cpp	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.cpp	2010-08-13 05:58:11 UTC (rev 52058)
@@ -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__)

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.cpp	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.cpp	2010-08-13 05:58:11 UTC (rev 52058)
@@ -27,7 +27,7 @@
 
 #include "mips-loader.h"
 
-#define __DEBUG_PLUGINS__
+//#define __DEBUG_PLUGINS__
 
 #ifdef __DEBUG_PLUGINS__
 #define DBG(x,...) printf(x, ## __VA_ARGS__)

Modified: scummvm/branches/gsoc2010-plugins/base/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/base/main.cpp	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/base/main.cpp	2010-08-13 05:58:11 UTC (rev 52058)
@@ -106,7 +106,7 @@
 	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 @@
 		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

Modified: scummvm/branches/gsoc2010-plugins/base/plugins.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/base/plugins.cpp	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/base/plugins.cpp	2010-08-13 05:58:11 UTC (rev 52058)
@@ -464,7 +464,7 @@
 	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 @@
 		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;

Modified: scummvm/branches/gsoc2010-plugins/gui/launcher.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/gui/launcher.cpp	2010-08-13 05:26:23 UTC (rev 52057)
+++ scummvm/branches/gsoc2010-plugins/gui/launcher.cpp	2010-08-13 05:58:11 UTC (rev 52058)
@@ -875,7 +875,7 @@
 
 	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);


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




More information about the Scummvm-git-logs mailing list