[CORE] Build non-vcpkg builds with zlib-1.1.4 again (#770)

Author: xezon

Core/Libraries/Source/Compression/CMakeLists.txt

@@ -41,6 +41,10 @@ target_link_libraries(core_compression PUBLIC
 
 find_package(ZLIB)
 if (ZLIB_FOUND)
+    # Adds zlib from vcpkg
     target_link_libraries(core_compression PUBLIC ZLIB::ZLIB)
-    target_compile_definitions(core_compression PUBLIC RTS_HAS_ZLIB)
-endif()
+else()
+    # Adds zlib from github repository
+    include(${CMAKE_SOURCE_DIR}/cmake/zlib.cmake)
+    target_link_libraries(core_compression PUBLIC libzlib)
+endif()

Core/Libraries/Source/Compression/Compression.h

@@ -33,7 +33,6 @@ enum CompressionType
 	COMPRESSION_NONE = COMPRESSION_MIN,
 	COMPRESSION_REFPACK,
 	COMPRESSION_NOXLZH,
-#ifdef RTS_HAS_ZLIB
 	COMPRESSION_ZLIB1,
 	COMPRESSION_ZLIB2,
 	COMPRESSION_ZLIB3,
@@ -43,7 +42,6 @@ enum CompressionType
 	COMPRESSION_ZLIB7,
 	COMPRESSION_ZLIB8,
 	COMPRESSION_ZLIB9,
-#endif
 	COMPRESSION_BTREE,
 	COMPRESSION_HUFF,
 	COMPRESSION_MAX = COMPRESSION_HUFF,

Core/Libraries/Source/Compression/CompressionManager.cpp

@@ -23,10 +23,10 @@
 
 #include "Compression.h"
 #include "LZHCompress/NoxCompress.h"
-#ifdef RTS_HAS_ZLIB
+
 #define __MACTYPES__
 #include <zlib.h>
-#endif
+
 #include "EAC/codex.h"
 #include "EAC/btreecodex.h"
 #include "EAC/huffcodex.h"
@@ -47,7 +47,6 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 		"No compression",
 		"RefPack",
 		"LZHL",
-#ifdef RTS_HAS_ZLIB
 		"ZLib 1 (fast)",
 		"ZLib 2",
 		"ZLib 3",
@@ -57,7 +56,6 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 		"ZLib 7",
 		"ZLib 8",
 		"ZLib 9 (slow)",
-#endif
 		"BTree",
 		"Huff",
 	};
@@ -71,7 +69,6 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 		"d_None",
 		"d_RefPack",
 		"d_NoxLZW",
-#ifdef RTS_HAS_ZLIB
 		"d_ZLib1",
 		"d_ZLib2",
 		"d_ZLib3",
@@ -81,7 +78,6 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 		"d_ZLib7",
 		"d_ZLib8",
 		"d_ZLib9",
-#endif
 		"d_BTree",
 		"d_Huff",
 	};
@@ -109,7 +105,6 @@ CompressionType CompressionManager::getCompressionType( const void *mem, Int len
 
 	if ( memcmp( mem, "NOX\0", 4 ) == 0 )
 		return COMPRESSION_NOXLZH;
-#ifdef RTS_HAS_ZLIB
 	if ( memcmp( mem, "ZL1\0", 4 ) == 0 )
 		return COMPRESSION_ZLIB1;
 	if ( memcmp( mem, "ZL2\0", 4 ) == 0 )
@@ -128,7 +123,6 @@ CompressionType CompressionManager::getCompressionType( const void *mem, Int len
 		return COMPRESSION_ZLIB8;
 	if ( memcmp( mem, "ZL9\0", 4 ) == 0 )
 		return COMPRESSION_ZLIB9;
-#endif
 	if ( memcmp( mem, "EAB\0", 4 ) == 0 )
 		return COMPRESSION_BTREE;
 	if ( memcmp( mem, "EAH\0", 4 ) == 0 )
@@ -150,7 +144,6 @@ Int CompressionManager::getMaxCompressedSize( Int uncompressedLen, CompressionTy
 		case COMPRESSION_HUFF:    // guessing here
 		case COMPRESSION_REFPACK: // guessing here
 			return uncompressedLen + 8;
-#ifdef RTS_HAS_ZLIB
 		case COMPRESSION_ZLIB1:
 		case COMPRESSION_ZLIB2:
 		case COMPRESSION_ZLIB3:
@@ -161,7 +154,6 @@ Int CompressionManager::getMaxCompressedSize( Int uncompressedLen, CompressionTy
 		case COMPRESSION_ZLIB8:
 		case COMPRESSION_ZLIB9:
 			return (Int)(ceil(uncompressedLen * 1.1 + 12 + 8));
-#endif
 	}
 
 	return 0;
@@ -176,7 +168,6 @@ Int CompressionManager::getUncompressedSize( const void *mem, Int len )
 	switch (compType)
 	{
 		case COMPRESSION_NOXLZH:
-#ifdef RTS_HAS_ZLIB
 		case COMPRESSION_ZLIB1:
 		case COMPRESSION_ZLIB2:
 		case COMPRESSION_ZLIB3:
@@ -186,7 +177,6 @@ Int CompressionManager::getUncompressedSize( const void *mem, Int len )
 		case COMPRESSION_ZLIB7:
 		case COMPRESSION_ZLIB8:
 		case COMPRESSION_ZLIB9:
-#endif
 		case COMPRESSION_BTREE:
 		case COMPRESSION_HUFF:
 		case COMPRESSION_REFPACK:
@@ -260,7 +250,6 @@ Int CompressionManager::compressData( CompressionType compType, void *srcVoid, I
 			return 0;
 	}
 
-#ifdef RTS_HAS_ZLIB
 	if (compType >= COMPRESSION_ZLIB1 && compType <= COMPRESSION_ZLIB9)
 	{
 		Int level = compType - COMPRESSION_ZLIB1 + 1; // 1-9
@@ -282,7 +271,6 @@ Int CompressionManager::compressData( CompressionType compType, void *srcVoid, I
 			return 0;
 		}
 	}
-#endif
 
 	return 0;
 }
@@ -334,7 +322,6 @@ Int CompressionManager::decompressData( void *srcVoid, Int srcLen, void *destVoi
 			return 0;
 	}
 
-#ifdef RTS_HAS_ZLIB
 	if (compType >= COMPRESSION_ZLIB1 && compType <= COMPRESSION_ZLIB9)
 	{
 		unsigned long outLen = destLen;
@@ -350,7 +337,6 @@ Int CompressionManager::decompressData( void *srcVoid, Int srcLen, void *destVoi
 			return 0;
 		}
 	}
-#endif
 
 	return 0;
 }

cmake/zlib.cmake

@@ -0,0 +1,30 @@
+set(ZLIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zlib-1.1.4-src/ZLib)
+
+FetchContent_Populate(zlib DOWNLOAD_EXTRACT_TIMESTAMP
+    GIT_REPOSITORY https://github.com/TheSuperHackers/zlib-1.1.4
+    GIT_TAG        ac753eee3990a2f592bd4807ff0b30ff572c2104
+    SOURCE_DIR     ${ZLIB_DIR}
+)
+    
+add_library(libzlib STATIC)
+
+target_sources(libzlib PRIVATE
+    "${ZLIB_DIR}/adler32.c"
+    "${ZLIB_DIR}/compress.c"
+    "${ZLIB_DIR}/crc32.c"
+    "${ZLIB_DIR}/gzio.c"
+    "${ZLIB_DIR}/uncompr.c"
+    "${ZLIB_DIR}/deflate.c"
+    "${ZLIB_DIR}/trees.c"
+    "${ZLIB_DIR}/zutil.c"
+    "${ZLIB_DIR}/inflate.c"
+    "${ZLIB_DIR}/infblock.c"
+    "${ZLIB_DIR}/inftrees.c"
+    "${ZLIB_DIR}/infcodes.c"
+    "${ZLIB_DIR}/infutil.c"
+    "${ZLIB_DIR}/inffast.c"
+)
+
+target_include_directories(libzlib PUBLIC ${ZLIB_DIR})
+
+target_compile_definitions(libzlib PUBLIC Z_PREFIX)