Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin.

CMakeLists.txt

@@ -27,6 +27,8 @@ set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VE
 
 configure_file ("${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp")
 
+option(OGRE_STATIC "Link static build of Ogre and Ogre Plugins into the binaries" FALSE)
+
 # Sound source selection
 option(USE_AUDIERE "use Audiere for sound" OFF)
 option(USE_FFMPEG "use ffmpeg for sound" OFF)

libs/openengine/ogre/renderer.cpp

@@ -48,10 +48,6 @@ bool OgreRenderer::loadPlugins()
     mParticleFXPlugin = new Ogre::ParticleFXPlugin();
     mRoot->installPlugin(mParticleFXPlugin);
     #endif
-    #ifdef ENABLE_PLUGIN_BSPSceneManager
-    mBSPPlugin = new Ogre::BspSceneManagerPlugin();
-    mRoot->installPlugin(mBSPPlugin);
-    #endif
     return true;
 }
 
@@ -88,7 +84,7 @@ bool OgreRenderer::configure(bool showConfig,
     // Disable logging
     log->setDebugOutputEnabled(false);
 
-#if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9) || defined(ENABLE_PLUGIN_CgProgramManager) || defined(ENABLE_PLUGIN_OctreeSceneManager) || defined(ENABLE_PLUGIN_ParticleFX) || defined(ENABLE_PLUGIN_BSPSceneManager)
+#if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9) || defined(ENABLE_PLUGIN_CgProgramManager) || defined(ENABLE_PLUGIN_OctreeSceneManager) || defined(ENABLE_PLUGIN_ParticleFX)
   mRoot = new Root("", cfgPath, "");
   loadPlugins();
 #else

libs/openengine/ogre/renderer.hpp

@@ -17,9 +17,6 @@
 #ifdef ENABLE_PLUGIN_ParticleFX
 # include "OgreParticleFXPlugin.h"
 #endif
-#ifdef ENABLE_PLUGIN_BSPSceneManager
-# include "OgreBspSceneManagerPlugin.h"
-#endif
 #ifdef ENABLE_PLUGIN_GL
 # include "OgreGLPlugin.h"
 #endif
@@ -56,9 +53,6 @@ namespace Render
  	#ifdef ENABLE_PLUGIN_ParticleFX
  	Ogre::ParticleFXPlugin* mParticleFXPlugin;
  	#endif
- 	#ifdef ENABLE_PLUGIN_BSPSceneManager
- 	Ogre::BspSceneManagerPlugin* mBSPPlugin;
- 	#endif
  	#ifdef ENABLE_PLUGIN_GL
  	Ogre::GLPlugin* mGLPlugin;
  	#endif