scenery: move static ReaderWriter proxies around.

Not yet sure where they end, but make sure they are currently pulled.
... now watching jenkins.

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index e292b55e1e001536edef1f95d0c9a3789bdf7862..fffb7f9adc90c14f177c498c7e2f485f7c698f0f 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -35,6 +35,7 @@
 #include <osg/ProxyNode>
 
 #include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
 #include <osgDB/ReaderWriter>
 #include <osgDB/ReadFile>
 #include <osgDB/Registry>
@@ -46,14 +47,11 @@
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/scene/material/mat.hxx>
 #include <simgear/scene/material/matlib.hxx>
-#include <simgear/scene/model/ModelRegistry.hxx>
 #include <simgear/scene/tgdb/apt_signs.hxx>
 #include <simgear/scene/tgdb/obj.hxx>
 #include <simgear/scene/util/OsgMath.hxx>
 #include <simgear/scene/util/SGReaderWriterOptions.hxx>
 
-#include "ReaderWriterSPT.hxx"
-#include "ReaderWriterSTG.hxx"
 #include "SGOceanTile.hxx"
 #include "TileEntry.hxx"
 
@@ -62,15 +60,6 @@ using namespace simgear;
 
 static ModelLoadHelper *_modelLoader=0;
 
-namespace {
-osgDB::RegisterReaderWriterProxy<ReaderWriterSTG> g_readerWriterSTGProxy;
-ModelRegistryCallbackProxy<LoadOnlyCallback> g_stgCallbackProxy("stg");
-
-osgDB::RegisterReaderWriterProxy<ReaderWriterSPT> g_readerWriterSPTProxy;
-ModelRegistryCallbackProxy<LoadOnlyCallback> g_sptCallbackProxy("spt");
-}
-
-
 static SGBucket getBucketFromFileName(const std::string& fileName)
 {
     std::istringstream ss(osgDB::getNameLessExtension(fileName));

diff --git a/simgear/scene/tgdb/userdata.cxx b/simgear/scene/tgdb/userdata.cxx
index 61c46b1e77da2dfcd64014b6a3c65d4259f1c7b3..2482f033d9d25dc781824770ad8456b6aa7b53fc 100644 (file)
--- a/simgear/scene/tgdb/userdata.cxx
+++ b/simgear/scene/tgdb/userdata.cxx
@@ -32,10 +32,12 @@
 #include <simgear/math/sg_random.h>
 #include <simgear/scene/material/mat.hxx>
 #include <simgear/scene/material/matmodel.hxx>
+#include <simgear/scene/model/ModelRegistry.hxx>
 
-#include "SGModelBin.hxx"
 #include "userdata.hxx"
 #include "SGReaderWriterBTG.hxx"
+#include "ReaderWriterSPT.hxx"
+#include "ReaderWriterSTG.hxx"
 
 // the following are static values needed by the runtime object
 // loader.  However, the loading is done via a call back so these
@@ -52,8 +54,16 @@ static SGPropertyNode *root_props = NULL;
 // none of the other object files in this library would be included in
 // the executable! Sticking the static proxy here forces the BTG code
 // to be sucked in.
+namespace {
 osgDB::RegisterReaderWriterProxy<SGReaderWriterBTG> g_readerWriter_BTG_Proxy;
 
+osgDB::RegisterReaderWriterProxy<simgear::ReaderWriterSTG> g_readerWriterSTGProxy;
+simgear::ModelRegistryCallbackProxy<simgear::LoadOnlyCallback> g_stgCallbackProxy("stg");
+
+osgDB::RegisterReaderWriterProxy<simgear::ReaderWriterSPT> g_readerWriterSPTProxy;
+simgear::ModelRegistryCallbackProxy<simgear::LoadOnlyCallback> g_sptCallbackProxy("spt");
+}
+
 void sgUserDataInit( SGPropertyNode *p ) {
     _inited = true;
     root_props = p;