fly/flightgear
1
0
Fork 0
Code Activity

Fix Mac data dir finding.

Browse source 
Mostly affects release builds, ensure data dir located within
the bundle is found correctly.
This commit is contained in:
James Turner 2013-08-26 22:21:55 +01:00
parent 467783bd45
commit 4052c45ea3
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Main/options.cxx
View file

@ -2233,10 +2233,13 @@ string Options::platformDefaultRoot() const
// 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(dataDir, kCFURLPOSIXPathStyle);
CFStringRef path = CFURLCopyFileSystemPath(absoluteDataUrl, kCFURLPOSIXPathStyle);
string root = CFStringGetCStringPtr(path, CFStringGetSystemEncoding());
CFRelease(absoluteDataUrl);
CFRelease(resourcesUrl);
CFRelease(dataDir);
CFRelease(path);