Fix for MSVC and move stuff around a bit in CMakeLists.txt and src/CMakeLists.txt

[oweals/minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index ff8cb3862276f3c1158b8336839dc7e9643221b7..522afa9efef160a566cdcf7a476ed2bfc8210184 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
+#include "log.h"
 
 #ifdef __APPLE__
        #include "CoreFoundation/CoreFoundation.h"
@@ -56,9 +57,10 @@ void sigint_handler(int sig)
                dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Ctrl-C pressed, shutting down."<<std::endl;
                
-               dstream<<DTIME<<"INFO: sigint_handler(): "
+               // Comment out for less clutter when testing scripts
+               /*dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Printing debug stacks"<<std::endl;
-               debug_stacks_print();
+               debug_stacks_print();*/
 
                g_killed = true;
        }
@@ -70,15 +72,49 @@ void sigint_handler(int sig)
 
 void signal_handler_init(void)
 {
-       dstream<<"signal_handler_init()"<<std::endl;
        (void)signal(SIGINT, sigint_handler);
 }
 
 #else // _WIN32
+       #include <signal.h>
+       #include <windows.h>
+       
+       BOOL WINAPI event_handler(DWORD sig)
+       {
+               switch(sig)
+               {
+               case CTRL_C_EVENT:
+               case CTRL_CLOSE_EVENT:
+               case CTRL_LOGOFF_EVENT:
+               case CTRL_SHUTDOWN_EVENT:
+
+                       if(g_killed == false)
+                       {
+                               dstream<<DTIME<<"INFO: event_handler(): "
+                                               <<"Ctrl+C, Close Event, Logoff Event or Shutdown Event, shutting down."<<std::endl;
+                               // Comment out for less clutter when testing scripts
+                               /*dstream<<DTIME<<"INFO: event_handler(): "
+                                               <<"Printing debug stacks"<<std::endl;
+                               debug_stacks_print();*/
+
+                               g_killed = true;
+                       }
+                       else
+                       {
+                               (void)signal(SIGINT, SIG_DFL);
+                       }
 
+                       break;
+               case CTRL_BREAK_EVENT:
+                       break;
+               }
+               
+               return TRUE;
+       }
+       
 void signal_handler_init(void)
 {
-       // No-op
+       SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
 }
 
 #endif
@@ -87,8 +123,14 @@ void signal_handler_init(void)
        Path mangler
 */
 
-std::string path_data = "../data";
-std::string path_userdata = "../";
+// Default to RUN_IN_PLACE style relative paths
+std::string path_share = "..";
+std::string path_user = "..";
+
+std::string getDataPath(const char *subpath)
+{
+       return path_share + DIR_DELIM + subpath;
+}
 
 void pathRemoveFile(char *path, char delim)
 {
@@ -109,7 +151,7 @@ void initializePaths()
                Use relative paths if RUN_IN_PLACE
        */
 
-       dstream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
+       infostream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
 
        /*
                Windows
@@ -121,16 +163,13 @@ void initializePaths()
        char buf[buflen];
        DWORD len;
        
-       // Find path of executable and set path_data relative to it
+       // Find path of executable and set path_share relative to it
        len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
        assert(len < buflen);
        pathRemoveFile(buf, '\\');
 
-       // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
-               
-       // Use "./bin/../"
-       path_userdata = std::string(buf) + "/../";
+       path_share = std::string(buf) + "\\..";
+       path_user = std::string(buf) + "\\..";
 
        /*
                Linux
@@ -145,22 +184,19 @@ void initializePaths()
        
        pathRemoveFile(buf, '/');
 
-       // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
-               
-       // Use "./bin/../"
-       path_userdata = std::string(buf) + "/../";
+       path_share = std::string(buf) + "/..";
+       path_user = std::string(buf) + "/..";
        
        /*
                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("../");
+       path_share = std::string("..");
+       path_user = std::string("..");
 
        #endif
 
@@ -170,7 +206,7 @@ void initializePaths()
                Use platform-specific paths otherwise
        */
 
-       dstream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
+       infostream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
 
        /*
                Windows
@@ -182,19 +218,18 @@ void initializePaths()
        char buf[buflen];
        DWORD len;
        
-       // Find path of executable and set path_data relative to it
+       // Find path of executable and set path_share relative to it
        len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
        assert(len < buflen);
        pathRemoveFile(buf, '\\');
        
-       // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
-       //path_data = std::string(buf) + "/../share/" + APPNAME;
+       // Use ".\bin\.."
+       path_share = std::string(buf) + "\\..";
                
-       // Use "C:\Documents and Settings\user\Application Data\<APPNAME>"
+       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
        len = GetEnvironmentVariable("APPDATA", buf, buflen);
        assert(len < buflen);
-       path_userdata = std::string(buf) + "/" + APPNAME;
+       path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
 
        /*
                Linux
@@ -209,15 +244,15 @@ void initializePaths()
        
        pathRemoveFile(buf, '/');
 
-       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_share = std::string(buf) + "/../share/" + PROJECT_NAME;
+       //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       if (!fs::PathExists(path_share)) {
+               dstream<<"WARNING: system-wide share not found at \""<<path_share<<"\"";
+               path_share = std::string(buf) + "/..";
+               dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
        }
        
-       path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
+       path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
        /*
                OS X
@@ -234,7 +269,7 @@ void initializePaths()
        {
                dstream<<"Bundle resource path: "<<path<<std::endl;
                //chdir(path);
-               path_data = std::string(path) + "/data";
+               path_share = std::string(path) + "/share";
        }
        else
     {
@@ -243,14 +278,16 @@ void initializePaths()
     }
     CFRelease(resources_url);
        
-       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME;
+       path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+
+       #elif defined(__FreeBSD__)
+
+       path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
     
        #endif
 
 #endif // RUN_IN_PLACE
-
-       dstream<<"path_data = "<<path_data<<std::endl;
-       dstream<<"path_userdata = "<<path_userdata<<std::endl;
 }
 
 } //namespace porting