Fix json-c build on macOS and fix some warnings

Also fixes build warning for CObject.cpp.

Removes need for `rt` on macOS.

Author: qaisjp

Server/mods/deathmatch/logic/CObject.cpp

@@ -156,10 +156,12 @@ bool CObject::ReadSpecialData(const int iLine)
         m_ucInterior = static_cast<unsigned char>(iTemp);
 
     if (GetCustomDataInt("dimension", iTemp, true))
+    {
         if (iTemp == -1)
             m_bVisibleInAllDimensions = true;
         else
             m_usDimension = static_cast<unsigned short>(iTemp);
+    }
 
     if (!GetCustomDataBool("doublesided", m_bDoubleSided, true))
         m_bDoubleSided = false;

Server/mods/deathmatch/premake5.lua

@@ -61,9 +61,11 @@ project "Deathmatch"
 
 	filter "system:not windows"
 		buildoptions { "-Wno-narrowing" } -- We should fix the warnings at some point
-		links { "rt" }
 		buildoptions { "-pthread" }
 		linkoptions { "-pthread" }
 
+	filter "system:linux"
+		links { "rt" }
+
 	filter "platforms:x64"
 		targetdir(buildpath("server/x64"))

Shared/XML/premake5.lua

@@ -35,7 +35,7 @@ project "XML"
 			copy "mta"
 		}
 
-	filter "system:not windows"
+	filter "system:linux"
 		links { "rt" }
 
 	filter "platforms:x64"

vendor/cryptopp/premake5.lua

@@ -144,6 +144,9 @@ project "cryptopp"
 		"keccak_core.cpp"
 	}
 
+	filter "system:macosx"
+		defines {"CRYPTOPP_DISABLE_ASM"}
+
 	filter "platforms:x64"
 		files {
 			"x64dll.asm",

vendor/json-c/linkhash.c

@@ -439,7 +439,7 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 /* a simple hash function similiar to what perl does for strings.
  * for good results, the string should not be excessivly large.
  */
-static unsigned long lh_perllike_str_hash(const void *k) 
+static unsigned long lh_perllike_str_hash(const void *k)
 {
     const char *rkey = (const char *)k;
     unsigned hashval = 1;

vendor/json-c/premake5.lua

@@ -24,3 +24,14 @@ project "json-c"
 
 	filter "system:not windows"
 		includedirs { "shipped_for_mta_linux" }
+
+	filter "system:macosx"
+		defines {"HAVE_XLOCALE_H"}
+
+		-- `#include <machine/endian.h>` works fine but `#include <endian.h>` does not
+		-- see linkhash.c line 23 (introduced in b95bda01e80359e)
+		--
+		-- This line should fix this, but it doesn't work because `/usr/local/include`
+		-- doesn't exist on macOS. If you want to fix this include, modify
+		--  shipped_for_mta_linux to re-enable inclusion of `endian.h` on macOS.
+		-- includedirs {"/usr/local/include/machine"}

vendor/json-c/shipped_for_mta_linux/config.h

@@ -43,7 +43,9 @@
 /* #undef HAVE_DOPRNT */
 
 /* Define to 1 if you have the <endian.h> header file. */
+#ifndef __APPLE__
 #define HAVE_ENDIAN_H 1
+#endif
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1