fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of git@gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Durk Talsma 2010-08-29 19:28:57 +02:00
commit 9197057784
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs-mini/README.MSVC
View file

@ -83,12 +83,17 @@ Typical setup should decompose into the following steps :
10. Open file D:\FGFSDevel\SimGear\simgear\version.h.in and change @VERSION@ into "2.0.0" or any current version
11. Save file as version.h in the same directory
12. Start build (usually F7)
13. Wait...
14. Enjoy - programs are in D:\FGFSDevel\FlightGear\projects\VC90\Win32\Release
13. Get the data from Gitorious too : git clone git://gitorious.org/fg/fgdata.git fgdata
14. Wait...
15. Add <any_directory_on_any_drive>/install/msvc90/OpenSceneGraph/bin and <any_directory_on_any_drive>/3rdParty/bin to your PATH environment variable
16. Enjoy - programs are in D:\FGFSDevel\FlightGear\projects\VC90\Win32\Release
It is also possible to compile a Debug version. This is only useful when hacking the code because
a Debug version is way slower than the Release one.
The 64bit build is only available to people having the Professional edition of Visual Studio 2008. In that case, 14. above should be :
14. Add <any_directory_on_any_drive>/install/msvc90-64/OpenSceneGraph/bin and <any_directory_on_any_drive>/3rdParty.x64/bin to your PATH environment variable
When the manual build works, it is possible to start it from the command line. This is useful
when setting up a build server or automating the process of retrieving the code and building
it in a scheduled task. To do that :

2
src/Autopilot/autopilot.cxx
View file

@ -97,7 +97,7 @@ void Autopilot::add_component( Component * component )
std::string name = component->get_name();
for( unsigned i = 0; get_subsystem( name.c_str() ) != NULL; i++ ) {
ostringstream buf;
buf << name << "_" << i;
buf << component->get_name() << "_" << i;
name = buf.str();
}
if( name != component->get_name() )

8
src/Autopilot/autopilotgroup.cxx
View file

@ -78,6 +78,9 @@ void FGXMLAutopilotGroupImplementation::init()
};
for( unsigned i = 0; i < sizeof(nodeNames)/sizeof(nodeNames[0]); i++ )
initFrom( fgGetNode( "/sim/systems" ), nodeNames[i] );
SGSubsystemGroup::bind();
SGSubsystemGroup::init();
}
void FGXMLAutopilotGroupImplementation::initFrom( SGPropertyNode_ptr rootNode, const char * childName )
@ -108,7 +111,7 @@ void FGXMLAutopilotGroupImplementation::initFrom( SGPropertyNode_ptr rootNode, c
string name = apName;
for( unsigned i = 0; get_subsystem( apName.c_str() ) != NULL; i++ ) {
ostringstream buf;
buf << apName << "_" << i;
buf << name << "_" << i;
apName = buf.str();
}
if( apName != name )
@ -135,9 +138,6 @@ void FGXMLAutopilotGroupImplementation::initFrom( SGPropertyNode_ptr rootNode, c
continue;
}
}
SGSubsystemGroup::bind();
SGSubsystemGroup::init();
}
FGXMLAutopilotGroup * FGXMLAutopilotGroup::createInstance()