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

Move setup code for OSG when statically linked

Browse source
This commit is contained in:
slothlife 2015-07-17 09:56:21 -05:00
parent 43b1f15af9
commit df99d5a59d
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/resource/texturemanager.cpp
View file

@ -1,24 +1,11 @@
#include "texturemanager.hpp" #include "texturemanager.hpp"
#include <osgDB/Registry> #include <osgDB/Registry>
#include <osgViewer/GraphicsWindow>
#include <stdexcept> #include <stdexcept>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#ifdef OSG_LIBRARY_STATIC
// This list of plugins should match with the list in the top-level CMakelists.txt.
USE_OSGPLUGIN(png)
USE_OSGPLUGIN(tga)
USE_OSGPLUGIN(dds)
USE_OSGPLUGIN(jpeg)
// Sets the default windowing system interface according to the OS.
// Necessary for OpenSceneGraph to do some things, like decompression.
USE_GRAPHICSWINDOW()
#endif
namespace namespace
{ {

14
components/sdlutil/sdlcursormanager.cpp
View file

@ -10,9 +10,23 @@
#include <osg/Geometry> #include <osg/Geometry>
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osg/TexMat> #include <osg/TexMat>
#include <osgDB/Registry>
#include <osgViewer/GraphicsWindow>
#include "imagetosurface.hpp" #include "imagetosurface.hpp"
#ifdef OSG_LIBRARY_STATIC
// This list of plugins should match with the list in the top-level CMakelists.txt.
USE_OSGPLUGIN(png)
USE_OSGPLUGIN(tga)
USE_OSGPLUGIN(dds)
USE_OSGPLUGIN(jpeg)
// Sets the default windowing system interface according to the OS.
// Necessary for OpenSceneGraph to do some things, like decompression.
USE_GRAPHICSWINDOW()
#endif
namespace namespace
{ {