From 6db6d69eedeb74d4863b2dd964407ca8bca1c4a8 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Thu, 28 Apr 2011 06:40:54 +0800
Subject: WINCE: Enable building of plugins with normal configure/make

Enables building of plugin .dlls without a custom Makefile.
Also removes generation of scummvm.exe.map from configure script.
---
 backends/plugins/sdl/sdl-provider.cpp     | 2 +-
 backends/plugins/win32/win32-provider.cpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'backends/plugins')

diff --git a/backends/plugins/sdl/sdl-provider.cpp b/backends/plugins/sdl/sdl-provider.cpp
index 2ebcd77379..00520b48b0 100644
--- a/backends/plugins/sdl/sdl-provider.cpp
+++ b/backends/plugins/sdl/sdl-provider.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(DYNAMIC_MODULES) && defined(SDL_BACKEND)
+#if defined(DYNAMIC_MODULES) && defined(SDL_BACKEND) && !defined(_WIN32_WCE)
 
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "backends/plugins/dynamic-plugin.h"
diff --git a/backends/plugins/win32/win32-provider.cpp b/backends/plugins/win32/win32-provider.cpp
index 5176ec179a..bcbc6bde9e 100644
--- a/backends/plugins/win32/win32-provider.cpp
+++ b/backends/plugins/win32/win32-provider.cpp
@@ -70,8 +70,15 @@ public:
 		#ifndef _WIN32_WCE
 		_dlHandle = LoadLibrary(_filename.c_str());
 		#else
-		if (!_filename.hasSuffix("scummvm.dll"))	// skip loading the core scummvm module
+		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
 
 		if (!_dlHandle) {
-- 
cgit v1.2.3