Possible tinygettext fix for mac & linux

Author: MohabCodeX

premake5.lua

@@ -157,19 +157,18 @@ workspace "MTASA"
 		include "vendor/cegui-0.4.0-custom/WidgetSets/Falagard"
 		include "vendor/cegui-0.4.0-custom"
 
-		group "Vendor"
-		include "vendor/portaudio"
-		include "vendor/cef3"
-		include "vendor/discord-rpc"
-		include "vendor/freetype"
-		include "vendor/jpeg-9f"
-		include "vendor/ksignals"
-		include "vendor/libpng"
-		include "vendor/tinygettext"
-		include "vendor/pthreads"
-		include "vendor/libspeex"
-		include "vendor/detours"
-		include "vendor/lunasvg"
+	group "Vendor"
+	include "vendor/portaudio"
+	include "vendor/cef3"
+	include "vendor/discord-rpc"
+	include "vendor/freetype"
+	include "vendor/jpeg-9f"
+	include "vendor/ksignals"
+	include "vendor/libpng"
+	include "vendor/pthreads"
+	include "vendor/libspeex"
+	include "vendor/detours"
+	include "vendor/lunasvg"
 	end
 
 	filter {}
@@ -196,6 +195,7 @@ workspace "MTASA"
 		include "vendor/pcre"
 		include "vendor/pme"
 		include "vendor/sqlite"
+		include "vendor/tinygettext"
 		include "vendor/tinyxml"
 		include "vendor/unrar"
 		include "vendor/zip"

vendor/tinygettext/dirent_win32.h

@@ -108,6 +108,7 @@
 #include <errno.h>
 #if defined(_MSC_VER)  &&  _MSC_VER >= 1400
     #include <windows.h>
+    #include <string>
 #endif
 
 /* Indicates that d_type field is available in dirent structure */
@@ -779,7 +780,10 @@ dirent_mbstowcs_s(
 
 #if defined(_MSC_VER)  &&  _MSC_VER >= 1400
 
-    wcscpy_s(wcstr, sizeInWords, utf8_mbstowcs(mbstr).c_str());
+    std::wstring wideStr = utf8_mbstowcs(std::string(mbstr));
+    wcscpy_s(wcstr, sizeInWords, wideStr.c_str());
+    if (pReturnValue)
+        *pReturnValue = wideStr.length() + 1;
     error = 0;
 
 #else
@@ -829,7 +833,10 @@ dirent_wcstombs_s(
 
 #if defined(_MSC_VER)  &&  _MSC_VER >= 1400
 
-    strcpy_s(mbstr, sizeInBytes, utf8_wcstombs(wcstr).c_str());
+    std::string narrowStr = utf8_wcstombs(wcstr);
+    strcpy_s(mbstr, sizeInBytes, narrowStr.c_str());
+    if (pReturnValue)
+        *pReturnValue = narrowStr.length() + 1;
     error = 0;
 
 #else

vendor/tinygettext/premake5.lua

@@ -21,4 +21,7 @@ project "tinygettext"
 	}
 
 	filter "system:windows"
-		disablewarnings { "4800", "4309", "4503", "4099", "4503" }
+		disablewarnings { "4800", "4309", "4503", "4099" }
+
+	filter { "system:linux or macosx" }
+		buildoptions { "-Wno-unused-parameter", "-Wno-unused-variable" }

vendor/tinygettext/unix_file_system.cpp

@@ -21,10 +21,10 @@
 #include <fstream>
 #ifdef WIN32
   #include <windows.h>
-  #include <UTF8.h>
+  #include "../../Shared/sdk/UTF8.h"
   #include <dirent_win32.h>
   #ifdef TGT_STANDALONE
-    #include <UTF8.hpp>
+    #include "../../Shared/sdk/UTF8.hpp"
   #endif
 #else
   #include <dirent.h>