[Scummvm-cvs-logs] scummvm master -> e27dd8ac4ea487d388c59db53d7d7ee1ce24e9c9

[Max Horn]

Off-topic question: Can somebody explain why cerial's commit mails have "ScummVM git <noreply at scummvm.org>" as sender? It's a mildly irritating, and I wonder why it happens (and whether one can "fix" it, if that's even appropriate).


Cheers,
Max

Am 20.05.2011 um 00:35 schrieb ScummVM git:

> 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:
> e27dd8ac4e WINCE: Change plugin extensions from .dll to .plugin - fixes erroneous loading of runtime-dlls
> 
> 
> Commit: e27dd8ac4ea487d388c59db53d7d7ee1ce24e9c9
>    https://github.com/scummvm/scummvm/commit/e27dd8ac4ea487d388c59db53d7d7ee1ce24e9c9
> Author: CeRiAl (ikhatib at gmail.com)
> Date: 2011-05-19T15:31:23-07:00
> 
> Commit Message:
> WINCE: Change plugin extensions from .dll to .plugin - fixes erroneous loading of runtime-dlls
> 
> Changed paths:
>    backends/plugins/win32/win32-provider.cpp
>    configure
> 
> 
> 
> diff --git a/backends/plugins/win32/win32-provider.cpp b/backends/plugins/win32/win32-provider.cpp
> index bcbc6bd..0a08e48 100644
> --- a/backends/plugins/win32/win32-provider.cpp
> +++ b/backends/plugins/win32/win32-provider.cpp
> @@ -67,19 +67,11 @@ public:
> 
> 	bool loadPlugin() {
> 		assert(!_dlHandle);
> -		#ifndef _WIN32_WCE
> +#ifndef _WIN32_WCE
> 		_dlHandle = LoadLibrary(_filename.c_str());
> -		#else
> -		if (!_filename.hasSuffix("scummvm.dll") &&
> -			!_filename.hasSuffix("libstdc++-6.dll") &&
> -			!_filename.hasSuffix("libgcc_s_sjlj-1.dll")) {
> -			// skip loading the core scummvm module and runtime dlls
> -			_dlHandle = LoadLibrary(toUnicode(_filename.c_str()));
> -		} else {
> -			// do not generate misleading error message
> -			return false;
> -		}
> -		#endif
> +#else
> +		_dlHandle = LoadLibrary(toUnicode(_filename.c_str()));
> +#endif
> 
> 		if (!_dlHandle) {
> 			debug("Failed loading plugin '%s' (error code %d)", _filename.c_str(), (int32) GetLastError());
> @@ -111,7 +103,11 @@ Plugin* Win32PluginProvider::createPlugin(const Common::FSNode &node) const {
> bool Win32PluginProvider::isPluginFilename(const Common::FSNode &node) const {
> 	// Check the plugin suffix
> 	Common::String filename = node.getName();
> +#ifndef _WIN32_WCE
> 	if (!filename.hasSuffix(".dll"))
> +#else
> +	if (!filename.hasSuffix(".plugin"))
> +#endif
> 		return false;
> 
> 	return true;
> diff --git a/configure b/configure
> index bdbda1a..c4243e1 100755
> --- a/configure
> +++ b/configure
> @@ -2324,12 +2324,12 @@ POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im
> 		HOSTEXEEXT=".dll"
> _def_plugin='
> #define PLUGIN_PREFIX	""
> -#define PLUGIN_SUFFIX	".dll"
> +#define PLUGIN_SUFFIX	".plugin"
> '
> _mak_plugins='
> DYNAMIC_MODULES		:= 1
> PLUGIN_PREFIX		:=
> -PLUGIN_SUFFIX		:= .dll
> +PLUGIN_SUFFIX		:= .plugin
> PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
> CXXFLAGS			+= -DDYNAMIC_MODULES
> PLUGIN_LDFLAGS		:= -shared -lscummvm -L.
> 
> 
> 
> ------------------------------------------------------------------------------
> What Every C/C++ and Fortran developer Should Know!
> Read this article and learn how Intel has extended the reach of its 
> next-generation tools to help Windows* and Linux* C/C++ and Fortran 
> developers boost performance applications - including clusters. 
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs
>