Merge from gsoc2010-plugins
This merge was extremely difficult to carry out. It wasn't entirely SVN's fault -- there were several merges to the branch that were done by hand. Please check for any issues and regressions. Also note that the DS makefile was not copied over since the "one at a time" plugin mode currently has too much fragmentation ie. it doesn't work. svn-id: r54051
This commit is contained in:
commit
13b904d282
49 changed files with 3699 additions and 1278 deletions
|
@ -922,7 +922,12 @@ void LauncherDialog::loadGame(int item) {
|
|||
gameId = _domains[item];
|
||||
|
||||
const EnginePlugin *plugin = 0;
|
||||
|
||||
#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
|
||||
EngineMan.findGameOnePlugAtATime(gameId, &plugin);
|
||||
#else
|
||||
EngineMan.findGame(gameId, &plugin);
|
||||
#endif
|
||||
|
||||
String target = _domains[item];
|
||||
target.toLowercase();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue