[CMAKE] Add VCPKG package manager and use for ZLib (#605)

Author: feliwir

.github/workflows/build-toolchain.yml

@@ -102,6 +102,9 @@ jobs:
         with:
           arch: x86
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+
       - name: Configure ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
         shell: pwsh
         run: |
@@ -138,7 +141,7 @@ jobs:
             } else {
             $files = Get-ChildItem -Path "$buildDir\Core","$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
           }
-          $files | Move-Item -Destination $artifactsDir -Verbose
+          $files | Move-Item -Destination $artifactsDir -Verbose -Force
 
       - name: Upload ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact
         uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -56,7 +56,6 @@ endif()
 include(cmake/config.cmake)
 include(cmake/gamespy.cmake)
 include(cmake/lzhl.cmake)
-include(cmake/zlib.cmake)
 
 add_subdirectory(Dependencies/Benchmark)
 if (IS_VS6_BUILD)

CMakePresets.json

@@ -17,7 +17,9 @@
                 "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
                 "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",
                 "CMAKE_BUILD_TYPE": "Release",
-                "RTS_FLAGS": "/W3"
+                "RTS_FLAGS": "/W3",
+                "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+                "VCPKG_TARGET_TRIPLET": "x86-windows"
             },
             "vendor": {
                 "jetbrains.com/clion": {
@@ -61,7 +63,8 @@
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
-                "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
+                "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
+                "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
             }
         },
         {

Core/Libraries/Source/Compression/CMakeLists.txt

@@ -34,7 +34,13 @@ target_link_libraries(core_compression PRIVATE
     corei_libraries_include
 )
 
+
 target_link_libraries(core_compression PUBLIC
     liblzhl
-    libzlib
 )
+
+find_package(ZLIB)
+if (ZLIB_FOUND)
+    target_link_libraries(core_compression PUBLIC ZLIB::ZLIB)
+    target_compile_definitions(core_compression PUBLIC RTS_HAS_ZLIB)
+endif()

Core/Libraries/Source/Compression/Compression.h

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

Core/Libraries/Source/Compression/CompressionManager.cpp

@@ -23,9 +23,10 @@
 
 #include "Compression.h"
 #include "LZHCompress/NoxCompress.h"
-extern "C" {
-#include "ZLib/zlib.h"
-}
+#ifdef RTS_HAS_ZLIB
+#define __MACTYPES__
+#include <zlib.h>
+#endif
 #include "EAC/codex.h"
 #include "EAC/btreecodex.h"
 #include "EAC/huffcodex.h"
@@ -46,6 +47,7 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 		"No compression",
 		"RefPack",
 		"LZHL",
+#ifdef RTS_HAS_ZLIB
 		"ZLib 1 (fast)",
 		"ZLib 2",
 		"ZLib 3",
@@ -55,6 +57,7 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 		"ZLib 7",
 		"ZLib 8",
 		"ZLib 9 (slow)",
+#endif
 		"BTree",
 		"Huff",
 	};
@@ -68,6 +71,7 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 		"d_None",
 		"d_RefPack",
 		"d_NoxLZW",
+#ifdef RTS_HAS_ZLIB
 		"d_ZLib1",
 		"d_ZLib2",
 		"d_ZLib3",
@@ -77,6 +81,7 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 		"d_ZLib7",
 		"d_ZLib8",
 		"d_ZLib9",
+#endif
 		"d_BTree",
 		"d_Huff",
 	};
@@ -104,7 +109,7 @@ 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 )
@@ -123,6 +128,7 @@ 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 )
@@ -144,7 +150,7 @@ 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:
@@ -155,6 +161,7 @@ Int CompressionManager::getMaxCompressedSize( Int uncompressedLen, CompressionTy
 		case COMPRESSION_ZLIB8:
 		case COMPRESSION_ZLIB9:
 			return (Int)(ceil(uncompressedLen * 1.1 + 12 + 8));
+#endif
 	}
 
 	return 0;
@@ -169,6 +176,7 @@ 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:
@@ -178,6 +186,7 @@ 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:
@@ -251,6 +260,7 @@ 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
@@ -259,7 +269,7 @@ Int CompressionManager::compressData( CompressionType compType, void *srcVoid, I
 		*(Int *)(dest+4) = 0;
 
 		unsigned long outLen = destLen;
-		Int err = z_compress2( dest+8, &outLen, src, srcLen, level );
+		Int err = compress2( (Bytef*)dest+8, &outLen, (const Bytef*)src, srcLen, level );
 
 		if (err == Z_OK || err == Z_STREAM_END)
 		{
@@ -272,6 +282,7 @@ Int CompressionManager::compressData( CompressionType compType, void *srcVoid, I
 			return 0;
 		}
 	}
+#endif
 
 	return 0;
 }
@@ -323,10 +334,11 @@ 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;
-		Int err = z_uncompress(dest, &outLen, src+8, srcLen-8);
+		Int err = uncompress((Bytef*)dest, &outLen, (const Bytef*)src+8, srcLen-8);
 		if (err == Z_OK || err == Z_STREAM_END)
 		{
 			return outLen;
@@ -338,6 +350,7 @@ Int CompressionManager::decompressData( void *srcVoid, Int srcLen, void *destVoi
 			return 0;
 		}
 	}
+#endif
 
 	return 0;
 }

cmake/zlib.cmake

@@ -0,0 +1,7 @@
+{
+    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+    "builtin-baseline": "b02e341c927f16d991edbd915d8ea43eac52096c",
+    "dependencies": [
+      "zlib"
+    ]
+  }