[Scummvm-git-logs] scummvm master -> 51c42478d249fdf276a51dcff7c8bdcd9ac613c6

[lotharsm]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
51c42478d2 BASE: WIN32: Exclude scummvm's base directory from plugin path


Commit: 51c42478d249fdf276a51dcff7c8bdcd9ac613c6
    https://github.com/scummvm/scummvm/commit/51c42478d249fdf276a51dcff7c8bdcd9ac613c6
Author: Lothar Serra Mari (mail at serra.me)
Date: 2020-09-13T18:03:16+02:00

Commit Message:
BASE: WIN32: Exclude scummvm's base directory from plugin path

Currently, the plugin architecture searches for plugins in ScummVM's
base directory and in the plugins directory itself.

However, for Win32, we need to bundle several DLL files in order to
make ScummVM run at all. Currently, this leads to several warning
messages since ScummVM tries to load those DLLs as plugins.

This patch excludes the ScummVM base directory when running on Win32 and
only accepts plugins from the plugins directory.

Changed paths:
    base/plugins.cpp


diff --git a/base/plugins.cpp b/base/plugins.cpp
index 1429fc2a92..a82d32bf1c 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -159,7 +159,9 @@ PluginList FilePluginProvider::getPlugins() {
 	Common::FSList pluginDirs;
 
 	// Add the default directories
+	#ifndef WIN32
 	pluginDirs.push_back(Common::FSNode("."));
+	#endif
 	pluginDirs.push_back(Common::FSNode("plugins"));
 
 	// Add the provider's custom directories