02/03: [USETUP] Use the smaller zlib_solo instead of the full zlib. CORE-14290

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc51b419c7eb2beffb4226...

commit dc51b419c7eb2beffb4226f94e3c8e7e567fe2f2
Author:     Thomas Faber [e-mail]
AuthorDate: Sat Feb 3 14:36:40 2018 +0100
Commit:     Thomas Faber [e-mail]
CommitDate: Sun Feb 4 12:54:39 2018 +0100

[USETUP] Use the smaller zlib_solo instead of the full zlib. CORE-14290
---
 base/setup/usetup/CMakeLists.txt | 2 +-
 base/setup/usetup/cabinet.c      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index 5922a4f040..46034af752 100644
--- 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 326d4935cf..8cc35aa796 100644
--- 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