From f0938e1a23f6cdd03bfd1e21d84f2c0f65aeb45f Mon Sep 17 00:00:00 2001
From: Tillsunset <35825944+Tillsunset@users.noreply.github.com>
Date: Sat, 15 Oct 2022 06:38:06 -0500
Subject: [PATCH] Fix CRC errors on MacOS(/Linux?) (#375)

Fixes graphic packs (like FPS++) not working even when enabled.
---
 src/util/crypto/crc32.cpp | 51 +++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/util/crypto/crc32.cpp b/src/util/crypto/crc32.cpp
index f6e88165..65c6a8f8 100644
--- a/src/util/crypto/crc32.cpp
+++ b/src/util/crypto/crc32.cpp
@@ -322,29 +322,34 @@ unsigned int crc32_calc_slice_by_8(unsigned int previousCrc32, const void* data,
 	// process eight bytes at once (Slicing-by-8)
 	while (length >= 8)
 	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		uint32_t one = *current++ ^ swap(crc);
-		uint32_t two = *current++;
-		crc = Crc32Lookup[0][two & 0xFF] ^
-			Crc32Lookup[1][(two >> 8) & 0xFF] ^
-			Crc32Lookup[2][(two >> 16) & 0xFF] ^
-			Crc32Lookup[3][(two >> 24) & 0xFF] ^
-			Crc32Lookup[4][one & 0xFF] ^
-			Crc32Lookup[5][(one >> 8) & 0xFF] ^
-			Crc32Lookup[6][(one >> 16) & 0xFF] ^
-			Crc32Lookup[7][(one >> 24) & 0xFF];
-#else
-		uint32_t one = *current++ ^ crc;
-		uint32_t two = *current++;
-		crc = Crc32Lookup[0][(two >> 24) & 0xFF] ^
-			Crc32Lookup[1][(two >> 16) & 0xFF] ^
-			Crc32Lookup[2][(two >> 8) & 0xFF] ^
-			Crc32Lookup[3][two & 0xFF] ^
-			Crc32Lookup[4][(one >> 24) & 0xFF] ^
-			Crc32Lookup[5][(one >> 16) & 0xFF] ^
-			Crc32Lookup[6][(one >> 8) & 0xFF] ^
-			Crc32Lookup[7][one & 0xFF];
-#endif
+		if constexpr (std::endian::native == std::endian::big){
+			uint32_t one = *current++ ^ swap(crc);
+			uint32_t two = *current++;
+			crc = Crc32Lookup[0][two & 0xFF] ^
+				  Crc32Lookup[1][(two >> 8) & 0xFF] ^
+				  Crc32Lookup[2][(two >> 16) & 0xFF] ^
+				  Crc32Lookup[3][(two >> 24) & 0xFF] ^
+				  Crc32Lookup[4][one & 0xFF] ^
+				  Crc32Lookup[5][(one >> 8) & 0xFF] ^
+				  Crc32Lookup[6][(one >> 16) & 0xFF] ^
+				  Crc32Lookup[7][(one >> 24) & 0xFF];
+		}
+		else if constexpr (std::endian::native == std::endian::little)
+		{
+			uint32_t one = *current++ ^ crc;
+			uint32_t two = *current++;
+			crc = Crc32Lookup[0][(two >> 24) & 0xFF] ^
+				  Crc32Lookup[1][(two >> 16) & 0xFF] ^
+				  Crc32Lookup[2][(two >> 8) & 0xFF] ^
+				  Crc32Lookup[3][two & 0xFF] ^
+				  Crc32Lookup[4][(one >> 24) & 0xFF] ^
+				  Crc32Lookup[5][(one >> 16) & 0xFF] ^
+				  Crc32Lookup[6][(one >> 8) & 0xFF] ^
+				  Crc32Lookup[7][one & 0xFF];
+		}
+		else {
+			cemu_assert(false);
+		}
 
 		length -= 8;
 	}