Move some OSG static library setup code

9 years ago · 1b3cc957f8
parent df99d5a59d
commit 1b3cc957f8
2 changed files with 8 additions and 6 deletions
--- a/components/resource/texturemanager.cpp
+++ b/components/resource/texturemanager.cpp
@ -6,6 +6,14 @@

 #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)
+#endif
+
 namespace
 {

--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@ -16,12 +16,6 @@
 #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()