diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | f37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch) | |
| tree | cde1e5f47f191beb4a9cefcd87872aef53b5fcec /src/porting.cpp | |
| parent | e261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff) | |
| parent | 13cf5425db613dc0a4323c87a4988bb18fb87aca (diff) | |
| download | minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.gz minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.bz2 minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/porting.cpp')
| -rw-r--r-- | src/porting.cpp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/porting.cpp b/src/porting.cpp index 7c7ce48ea..7de042ab5 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -27,6 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "config.h" #include "debug.h" +#ifdef __APPLE__ + #include "CoreFoundation/CoreFoundation.h" +#endif + namespace porting { @@ -215,9 +219,26 @@ void initializePaths() #elif defined(__APPLE__) #include <unistd.h> + // Code based on + // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c + CFBundleRef main_bundle = CFBundleGetMainBundle(); + CFURLRef resources_url = CFBundleCopyResourcesDirectoryURL(main_bundle); + char path[PATH_MAX]; + if(CFURLGetFileSystemRepresentation(resources_url, TRUE, (UInt8 *)path, PATH_MAX)) + { + dstream<<"Bundle resource path: "<<path<<std::endl; + //chdir(path); + path_data = std::string(path) + "/data"; + } + else + { + // error! + dstream<<"WARNING: Could not determine bundle resource path"<<std::endl; + } + CFRelease(resources_url); + path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME; - path_data = std::string("minetest-mac.app/Contents/Resources/data/"); - + #endif #endif // RUN_IN_PLACE |