Fix folder names and (hopefully) rich presence for cross win compilation

Author: kimden

src/io/file_manager.cpp

@@ -979,17 +979,27 @@ void FileManager::checkAndCreateConfigDir()
     else
     {
 
-#if defined(WIN32)
+    #if defined(WIN_BUILD)
 
         // Try to use the APPDATA directory to store config files and highscore
         // lists. If not defined, used the current directory.
+
+        std::string dir = "";
+
+    #if defined(WIN32)
         std::vector<wchar_t> env;
         // An environment variable has a maximum size limit of 32,767 characters
         env.resize(32767, 0);
         DWORD length = GetEnvironmentVariable(L"APPDATA", env.data(), 32767);
         if (length != 0)
+            dir = StringUtils::wideToUtf8(env.data());
+    #else
+        dir = getenv("APPDATA");
+    #endif
+
+        if (!dir.empty())
         {
-            m_user_config_dir = StringUtils::wideToUtf8(env.data());
+            m_user_config_dir = dir;
             if (!checkAndCreateDirectory(m_user_config_dir))
             {
                 Log::error("FileManager", "Can't create config dir '%s"
@@ -1097,7 +1107,7 @@ void FileManager::checkAndCreateConfigDir()
  */
 void FileManager::checkAndCreateAddonsDir()
 {
-#if defined(WIN32)
+#if defined(WIN_BUILD)
     m_addons_dir  = m_user_config_dir+"../addons/";
 #elif defined(__HAIKU__)
     m_addons_dir  = m_user_config_dir+"addons/";
@@ -1138,7 +1148,7 @@ void FileManager::checkAndCreateAddonsDir()
  */
 void FileManager::checkAndCreateScreenshotDir()
 {
-#if defined(WIN32) || defined(__HAIKU__)
+#if defined(WIN_BUILD) || defined(__HAIKU__)
     m_screenshot_dir  = m_user_config_dir+"screenshots/";
 #elif defined(__APPLE__)
     m_screenshot_dir  = getenv("HOME");
@@ -1164,7 +1174,7 @@ void FileManager::checkAndCreateScreenshotDir()
  */
 void FileManager::checkAndCreateReplayDir()
 {
-#if defined(WIN32) || defined(__HAIKU__)
+#if defined(WIN_BUILD) || defined(__HAIKU__)
     m_replay_dir = m_user_config_dir + "replay/";
 #elif defined(__APPLE__)
     m_replay_dir  = getenv("HOME");
@@ -1190,7 +1200,7 @@ void FileManager::checkAndCreateReplayDir()
 */
 void FileManager::checkAndCreateCachedTexturesDir()
 {
-#if defined(WIN32) || defined(__HAIKU__)
+#if defined(WIN_BUILD) || defined(__HAIKU__)
     m_cached_textures_dir = m_user_config_dir + "cached-textures/";
 #elif defined(__APPLE__)
     m_cached_textures_dir = getenv("HOME");
@@ -1215,7 +1225,7 @@ void FileManager::checkAndCreateCachedTexturesDir()
  */
 void FileManager::checkAndCreateGPDir()
 {
-#if defined(WIN32) || defined(__HAIKU__)
+#if defined(WIN_BUILD) || defined(__HAIKU__)
     m_gp_dir = m_user_config_dir + "grandprix/";
 #elif defined(__APPLE__)
     m_gp_dir  = getenv("HOME");

src/io/rich_presence.cpp

@@ -21,7 +21,7 @@
 #include "online/request_manager.hpp"
 #include "online/http_request.hpp"
 
-#if defined(__SWITCH__) || defined(MOBILE_STK) || defined(SERVER_ONLY) || defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(__SWITCH__) || defined(MOBILE_STK) || defined(SERVER_ONLY)
 #define DISABLE_RPC
 #endif
 
@@ -77,7 +77,8 @@ void RichPresence::destroy()
 }
 
 RichPresence::RichPresence() : m_connected(false), m_ready(false), m_last(0),
-#if defined(WIN32) && !(defined(__MINGW32__) || defined(__MINGW64__))
+#if defined(WIN_BUILD)
+// && !(defined(__MINGW32__) || defined(__MINGW64__))
     m_socket(INVALID_HANDLE_VALUE),
 #else
     m_socket(-1),
@@ -98,7 +99,7 @@ RichPresence::~RichPresence()
 void RichPresence::terminate()
 {
 #ifndef DISABLE_RPC
-#ifdef WIN32
+#ifdef WIN_BUILD
 #define UNCLEAN m_socket != INVALID_HANDLE_VALUE
 #else
 #define UNCLEAN m_socket != -1
@@ -166,7 +167,7 @@ bool RichPresence::doConnect()
     basePath = "/tmp";
     completed:
     basePath = basePath + "/";
-#elif defined(WIN32)
+#elif defined(WIN_BUILD)
     // Windows uses named pipes
     std::string basePath = "\\\\?\\pipe\\";
 #endif

src/io/rich_presence.hpp

@@ -1,5 +1,5 @@
 #include <atomic>
-#ifdef WIN32
+#ifdef WIN_BUILD
 #include <namedpipeapi.h>
 #endif
 #include <thread>
@@ -26,7 +26,7 @@ namespace RichPresenceNS
         bool m_connected;
         std::atomic_bool m_ready;
         time_t m_last;
-#ifdef WIN32
+#ifdef WIN_BUILD
         HANDLE m_socket;
 #else
         int m_socket;