[USETUP] Use the smaller zlib_solo instead of the full zlib. CORE-14290

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index 5922a4f..46034af 100644 (file)
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -40,7 +40,7 @@ if(USE_CLANG_CL)
     add_target_compile_flags(usetup "-Wno-invalid-source-encoding")
 endif()
 
-target_link_libraries(usetup zlib inflib ext2lib vfatlib)
+target_link_libraries(usetup zlib_solo inflib ext2lib vfatlib)
 set_module_type(usetup nativecui)
 add_importlibs(usetup ntdll)
 add_pch(usetup usetup.h SOURCE)

diff --git a/base/setup/usetup/cabinet.c b/base/setup/usetup/cabinet.c
index 326d493..8cc35aa 100644 (file)
--- a/base/setup/usetup/cabinet.c
+++ b/base/setup/usetup/cabinet.c
@@ -10,6 +10,7 @@
 
 #include "usetup.h"
 
+#define Z_SOLO
 #include <zlib.h>
 
 #define NDEBUG