macOS: make dbconmy compile

`brew install mysql` required

Author: qaisjp

Server/core/premake5.lua

@@ -49,6 +49,8 @@ project "Core"
 
 	filter "system:macosx"
 		links { "ncurses", "breakpad", "CoreFoundation.framework" }
+		buildoptions { "-pthread" }
+		linkoptions { "-pthread" }
 
 		-- This makes ncurses `get_wch` work
 		defines { "_XOPEN_SOURCE_EXTENDED=1" }

Server/dbconmy/CDatabaseConnectionMySql.cpp

@@ -105,7 +105,7 @@ CDatabaseConnectionMySql::CDatabaseConnectionMySql(CDatabaseType* pManager, cons
     m_handle = mysql_init(NULL);
     if (m_handle)
     {
-        my_bool reconnect = m_bAutomaticReconnect;
+        bool reconnect = m_bAutomaticReconnect;
         mysql_options(m_handle, MYSQL_OPT_RECONNECT, &reconnect);
         if (!strCharset.empty())
             mysql_options(m_handle, MYSQL_SET_CHARSET_NAME, strCharset);

Server/dbconmy/premake5.lua

@@ -3,57 +3,60 @@ project "Dbconmy"
 	kind "SharedLib"
 	targetname "dbconmy"
 	targetdir(buildpath("server/mods/deathmatch"))
-	
+
 	filter "system:windows"
-		includedirs { 
+		includedirs {
 			"../../vendor/mysql/include",
 			"../../vendor/sparsehash/src/windows"
 		}
-	
+
 	filter {}
-		includedirs { 
-			"../sdk", 
+		includedirs {
+			"../sdk",
 			"../../vendor/google-breakpad/src",
 			"../../vendor/sparsehash/src/"
 		}
-		
+
 	pchheader "StdInc.h"
 	pchsource "StdInc.cpp"
-	
-	vpaths { 
+
+	vpaths {
 		["Headers/*"] = "**.h",
 		["Sources"] = "*.c",
 		["*"] = "premake5.lua"
 	}
-	
+
 	files {
 		"premake5.lua",
 		"*.h",
 		"*.cpp"
 	}
-	
+
 	filter "system:linux"
 		includedirs { "/usr/include/mysql" }
 		links { "rt" }
 
-	if GLIBC_COMPAT then 			
+	filter "system:macosx"
+		includedirs { "/usr/local/opt/mysql/include/mysql/" }
+
+	if GLIBC_COMPAT then
 		filter { "system:linux" }
 			buildoptions { "-pthread" }
 			linkoptions { "-l:libmysqlclient.a", "-pthread" }
 			links { "z", "dl", "m" }
-	else 
-		filter "system:linux"
+	else
+		filter "system:linux or macosx"
 			links { "mysqlclient" }
 		filter {"system:linux", "platforms:x86"}
 			libdirs { "/usr/lib32/mysql" }
 		filter {"system:linux", "platforms:x64"}
 			libdirs { "/usr/lib64/mysql" }
-	end 
-	
+	end
+
 	filter { "system:windows", "platforms:x64" }
 		links { "../../vendor/mysql/lib/x64/libmysql.lib" }
 	filter { "system:windows", "platforms:x86" }
 		links { "../../vendor/mysql/lib/x86/libmysql.lib" }
-	
+
 	filter "platforms:x64"
 		targetdir(buildpath("server/x64"))

premake5.lua

@@ -7,11 +7,11 @@ require "install_cef"
 
 -- Set CI Build global
 local ci = os.getenv("CI")
-if ci and ci:lower() == "true" then 
-	CI_BUILD = true 
-else 
+if ci and ci:lower() == "true" then
+	CI_BUILD = true
+else
 	CI_BUILD = false
-end 
+end
 GLIBC_COMPAT = os.getenv("GLIBC_COMPAT") == "true"
 
 workspace "MTASA"
@@ -26,31 +26,31 @@ workspace "MTASA"
 
 	location "Build"
 	startproject "Client Launcher"
-	
+
 	cppdialect "C++17"
 	characterset "MBCS"
 	pic "On"
 	symbols "On"
-	
+
 	dxdir = os.getenv("DXSDK_DIR") or ""
-	includedirs { 
+	includedirs {
 		"vendor",
-		"Shared/sdk", 
+		"Shared/sdk",
 	}
 
-	defines { 
+	defines {
 		"_CRT_SECURE_NO_WARNINGS",
 		"_SCL_SECURE_NO_WARNINGS",
 		"_CRT_NONSTDC_NO_DEPRECATE",
 		"NOMINMAX",
 		"_TIMESPEC_DEFINED"
 	}
-		
-	-- Helper function for output path 
+
+	-- Helper function for output path
 	buildpath = function(p) return "%{wks.location}/../Bin/"..p.."/" end
-	copy = function(p) return "{COPY} %{cfg.buildtarget.abspath} \"%{wks.location}../Bin/"..p.."/\"" end 
+	copy = function(p) return "{COPY} %{cfg.buildtarget.abspath} \"%{wks.location}../Bin/"..p.."/\"" end
 
-	if GLIBC_COMPAT then 
+	if GLIBC_COMPAT then
 		filter { "system:linux" }
 			includedirs "/compat"
 			linkoptions "-static-libstdc++ -static-libgcc"
@@ -60,53 +60,53 @@ workspace "MTASA"
 		filter { "system:linux", "platforms:x64" }
 			libdirs { "/compat/x64" }
 	end
-	
+
 	filter "platforms:x86"
 		architecture "x86"
 	filter "platforms:x64"
 		architecture "x86_64"
-	
+
 	filter "configurations:Debug"
 		defines { "MTA_DEBUG" }
 		targetsuffix "_d"
-	
+
 	filter "configurations:Release or configurations:Nightly"
 		optimize "Speed"	-- "On"=MS:/Ox GCC:/O2  "Speed"=MS:/O2 GCC:/O3  "Full"=MS:/Ox GCC:/O3
-	
+
 	if CI_BUILD then
 		filter {}
 			defines { "CI_BUILD=1" }
-		
+
 		filter { "system:linux" }
 			linkoptions { "-s" }
-	end 
-	
+	end
+
 	filter {"system:windows", "configurations:Nightly", "kind:not StaticLib"}
 		os.mkdir("Build/Symbols")
 		linkoptions "/PDB:\"Symbols\\$(ProjectName).pdb\""
-	
+
 	filter {"system:windows", "toolset:*_xp*"}
 		buildoptions { "/Zc:threadSafeInit-" } -- Fix Windows XP not initialising TLS early
-	
+
 	filter "system:windows"
 		toolset "v141"
 		staticruntime "On"
 		defines { "WIN32", "_WIN32" }
-		includedirs { 
+		includedirs {
 			path.join(dxdir, "Include")
 		}
 		libdirs {
 			path.join(dxdir, "Lib/x86")
 		}
-	
+
 	filter {"system:windows", "configurations:Debug"}
 		buildoptions { "/MT" } -- Don't use debug runtime when static linking
 		defines { "DEBUG" } -- Using DEBUG as _DEBUG is not available with /MT
 
 	filter "system:linux"
 		vectorextensions "SSE2"
 		buildoptions { "-fvisibility=hidden" }
-	
+
 	-- Only build the client on Windows
 	if os.target() == "windows" then
 		group "Client"
@@ -121,12 +121,12 @@ workspace "MTASA"
 		include "Client/loader"
 		include "Client/multiplayer_sa"
 		include "Client/mods/deathmatch"
-		
+
 		group "Client/CEGUI"
 		include "vendor/cegui-0.4.0-custom/src/renderers/directx9GUIRenderer"
 		include "vendor/cegui-0.4.0-custom/WidgetSets/Falagard"
 		include "vendor/cegui-0.4.0-custom"
-		
+
 		group "Vendor"
 		include "vendor/portaudio"
 		include "vendor/cef3"
@@ -137,7 +137,7 @@ workspace "MTASA"
 		include "vendor/pthreads"
 		include "vendor/libspeex"
 	end
-	
+
 	filter {}
 		group "Server"
 		include "Server/core"
@@ -149,7 +149,7 @@ workspace "MTASA"
 		group "Shared"
 		include "Shared"
 		include "Shared/XML"
-		
+
 		group "Vendor"
 		include "vendor/bcrypt"
 		include "vendor/cryptopp"