fly/flightgear
1
0
Fork 0
Code Activity

Minor changes

Browse source 
Essentially, adapt two places where options.xml was supposed to be found
in $FG_ROOT (in one of these, the comment was already incorrect way
before the recent change moving options.xml out of FGData).
This commit is contained in:
Florent Rougon 2016-12-26 23:03:22 +01:00
parent 7288628919
commit f4d8d8c6a1
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/make-base-package.noarch.sh
View file

@ -78,7 +78,6 @@ tar \
data/Models \
data/MP \
data/N* \
data/options.xml \
data/preferences.xml \
data/Protocol \
data/README \

12
src/Main/options.cxx
View file

@ -35,9 +35,9 @@
#include <3rdparty/cjson/cJSON.h>
#include <cmath> // rint()
#include <stdio.h>
#include <stdlib.h> // atof(), atoi()
#include <string.h> // strcmp()
#include <cstdio>
#include <cstdlib> // atof(), atoi()
#include <cstring> // strcmp()
#include <algorithm>
#include <iostream>
@ -322,8 +322,8 @@ private:
int getNumMaturity(const char * str)
{
// changes should also be reflected in $FG_ROOT/data/options.xml &
// $FG_ROOT/data/Translations/string-default.xml
// Changes should also be reflected in
// $FG_INSTALL_PREFIX/share/flightgear/options.xml.
const char* levels[] = {"alpha","beta","early-production","production"};
if (!strcmp(str, "all")) {
@ -2470,7 +2470,7 @@ void Options::showUsage() const
SGPropertyNode *options = options_root.getNode("options");
if (!options) {
SG_LOG( SG_GENERAL, SG_ALERT,
"Error reading options.xml: <options> directive not found." );
"Error reading options.xml: <options> element not found." );
exit(-1);
}