Prevent threadid_t from losing precision when casted on 64bit systems

[minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 7c7ce48eae3a62265bab4856e867334daeff3f95..3dd9b43c3c24b8be79856e24f72ffd546abbfd73 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -26,6 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "config.h"
 #include "debug.h"
+#include "filesys.h"
+
+#ifdef __APPLE__
+       #include "CoreFoundation/CoreFoundation.h"
+#endif
 
 namespace porting
 {
@@ -149,10 +154,10 @@ void initializePaths()
        /*
                OS X
        */
-       #elif defined(__APPLE__)
+       #elif defined(__APPLE__) || defined(__FreeBSD__)
        
        //TODO: Get path of executable. This assumes working directory is bin/
-       dstream<<"WARNING: Relative path not properly supported on OS X"
+       dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
                        <<std::endl;
        path_data = std::string("../data");
        path_userdata = std::string("../");
@@ -206,6 +211,11 @@ void initializePaths()
 
        path_data = std::string(buf) + "/../share/" + APPNAME;
        //path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
+       if (!fs::PathExists(path_data)) {
+               dstream<<"WARNING: data path " << path_data << " not found!";
+               path_data = std::string(buf) + "/../data";
+               dstream<<" Trying " << path_data << std::endl;
+       }
        
        path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
 
@@ -215,9 +225,31 @@ 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/");
 
+       #elif defined(__FreeBSD__)
+
+       path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
+       path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
+    
        #endif
 
 #endif // RUN_IN_PLACE