Merge branch 'master' into fix/refresh-aclrequest

Author: MohabCodeX

Server/dbconmy/premake5.lua

@@ -38,18 +38,19 @@ project "Dbconmy"
 		links { "rt" }
 
 	filter "system:macosx"
+		-- brew install mysql-client libidn2
 		includedirs {
 			os.findheader("mysql.h", {
 				"/usr/local/opt/mysql/include/mysql",
 				"/opt/homebrew/include/mysql",
-				"/opt/osxcross/macports/pkgs/opt/local/include/mysql8/mysql",
+				"/opt/homebrew/opt/mysql-client/include/mysql",
 			})
 		}
 		libdirs {
 			os.findlib("libmysqlclient.a", {
 				"/usr/local/opt/mysql/lib",
 				"/opt/homebrew/lib",
-				"/opt/osxcross/macports/pkgs/opt/local/lib/mysql8/mysql",
+				"/opt/homebrew/opt/mysql-client/lib",
 			})
 		}