From 85bdb49d1b18b9653f5e35cbee397342b92edf2c Mon Sep 17 00:00:00 2001
From: Michal Sciubidlo <michal.sciubidlo@gmail.com>
Date: Fri, 11 Jan 2013 09:10:48 +0100
Subject: [PATCH] Mix debug and release if necessary under non Windows systems.

---
 components/files/ogreplugin.cpp | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/components/files/ogreplugin.cpp b/components/files/ogreplugin.cpp
index ca90fd30e..c319f7758 100644
--- a/components/files/ogreplugin.cpp
+++ b/components/files/ogreplugin.cpp
@@ -6,11 +6,6 @@
 namespace Files {
 
 bool loadOgrePlugin(const std::string &pluginDir, std::string pluginName, Ogre::Root &ogreRoot) {
-    // Append plugin suffix if debugging.
-#if defined(DEBUG)
-	pluginName = pluginName + OGRE_PLUGIN_DEBUG_SUFFIX;
-#endif
-
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 	std::ostringstream verStream;
 	verStream << "." << OGRE_VERSION_MAJOR << "." << OGRE_VERSION_MINOR << "." << OGRE_VERSION_PATCH;
@@ -28,13 +23,28 @@ bool loadOgrePlugin(const std::string &pluginDir, std::string pluginName, Ogre::
     pluginExt = ".so";
 #endif
 
-    std::string pluginPath = pluginDir + "/" + pluginName + pluginExt;
+    // Append plugin suffix if debugging.
+    std::string pluginPath;
+#if defined(DEBUG)
+    pluginPath = pluginDir + "/" + pluginName + OGRE_PLUGIN_DEBUG_SUFFIX + pluginExt;
+    if (boost::filesystem::exists(pluginPath)) {
+        ogreRoot.loadPlugin(pluginPath);
+        return true;
+    }
+    else {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        return false;
+#endif //OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+    }
+#endif //defined(DEBUG)
+    
+    pluginPath = pluginDir + "/" + pluginName + pluginExt;
     if (boost::filesystem::exists(pluginPath)) {
-    	ogreRoot.loadPlugin(pluginPath);
-    	return true;
+        ogreRoot.loadPlugin(pluginPath);
+        return true;
     }
     else {
-    	return false;
+        return false;
     }
 }