teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

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

Browse source
This commit is contained in:
k1ll 2012-03-17 20:03:37 +01:00
parent 7d81422c27
commit b83b7d0650
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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") 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 # Sound source selection
option(USE_AUDIERE "use Audiere for sound" OFF) option(USE_AUDIERE "use Audiere for sound" OFF)
option(USE_FFMPEG "use ffmpeg for sound" OFF) option(USE_FFMPEG "use ffmpeg for sound" OFF)

6
libs/openengine/ogre/renderer.cpp
View file

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

6
libs/openengine/ogre/renderer.hpp
View file

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