fly/flightgear
1
0
Fork 0
Code Activity

One more Mac helper moved into CocoaHelpers.mm

Browse source
This commit is contained in:
James Turner 2013-11-18 15:52:30 +00:00
parent 8b4b49cad2
commit 2331956539
2 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/GUI/CocoaHelpers.mm
View file

@ -32,6 +32,7 @@
// flightgear
#include <GUI/MessageBox.hxx>
#include <Main/options.hxx>
NSString* stdStringToCocoa(const std::string& s)
{
@ -122,3 +123,18 @@ SGPath platformDefaultDataPath()
appData.append("FlightGear");
return appData;
}
namespace flightgear
{
std::string Options::platformDefaultRoot() const
{
CocoaAutoreleasePool ap;
NSURL* url = [[NSBundle mainBundle] resourceURL];
SGPath dataDir(URLToPath(url));
dataDir.append("data");
return dataDir.str();
}
} // of namespace flightgear

29
src/Main/options.cxx
View file

@ -76,10 +76,6 @@
# include <Include/no_version.h>
#endif
#ifdef __APPLE__
# include <CoreFoundation/CoreFoundation.h>
#endif
using std::string;
using std::sort;
using std::cout;
@ -2356,30 +2352,7 @@ string Options::platformDefaultRoot() const
return "..\\data";
}
#elif defined(__APPLE__)
string Options::platformDefaultRoot() const
{
/*
The following code looks for the base package inside the application
bundle, in the standard Contents/Resources location.
*/
CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
// look for a 'data' subdir
CFURLRef dataDir = CFURLCreateCopyAppendingPathComponent(NULL, resourcesUrl, CFSTR("data"), true);
CFURLRef absoluteDataUrl = CFURLCopyAbsoluteURL(dataDir);
// now convert down to a path, and the a c-string
CFStringRef path = CFURLCopyFileSystemPath(absoluteDataUrl, kCFURLPOSIXPathStyle);
string root = CFStringGetCStringPtr(path, CFStringGetSystemEncoding());
CFRelease(absoluteDataUrl);
CFRelease(resourcesUrl);
CFRelease(dataDir);
CFRelease(path);
return root;
}
// platformDefaultRoot defined in CocoaHelpers.mm
#else
string Options::platformDefaultRoot() const
{