From b83b7d0650cdd77a8da0568cd70c4ed4de64470a Mon Sep 17 00:00:00 2001
From: k1ll <karl.glatzer@gmx.de>
Date: Sat, 17 Mar 2012 20:03:37 +0100
Subject: [PATCH] Added OGRE_STATIC as cmake option and removed the code for
 the BSPSceneManager plugin.

---
 CMakeLists.txt                    | 2 ++
 libs/openengine/ogre/renderer.cpp | 6 +-----
 libs/openengine/ogre/renderer.hpp | 6 ------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfa6dd8b0a..e5256aa7f1 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index f2a23c831d..4ded3343f5 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/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
diff --git a/libs/openengine/ogre/renderer.hpp b/libs/openengine/ogre/renderer.hpp
index fa7435501f..6516b0a80c 100644
--- a/libs/openengine/ogre/renderer.hpp
+++ b/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