From df99d5a59d98410391cd2bfe70290db79748b7d9 Mon Sep 17 00:00:00 2001
From: slothlife <slothlife@users.noreply.github.com>
Date: Fri, 17 Jul 2015 09:56:21 -0500
Subject: [PATCH] Move setup code for OSG when statically linked

---
 components/resource/texturemanager.cpp  | 13 -------------
 components/sdlutil/sdlcursormanager.cpp | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/components/resource/texturemanager.cpp b/components/resource/texturemanager.cpp
index eca711b3c..62cbd6bb3 100644
--- a/components/resource/texturemanager.cpp
+++ b/components/resource/texturemanager.cpp
@@ -1,24 +1,11 @@
 #include "texturemanager.hpp"
 
 #include <osgDB/Registry>
-#include <osgViewer/GraphicsWindow>
 
 #include <stdexcept>
 
 #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
 {
 
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index d8d4b0b50..508d72589 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -10,9 +10,23 @@
 #include <osg/Geometry>
 #include <osg/Texture2D>
 #include <osg/TexMat>
+#include <osgDB/Registry>
+#include <osgViewer/GraphicsWindow>
 
 #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
 {