From dc51b419c7eb2beffb4226f94e3c8e7e567fe2f2 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 3 Feb 2018 14:36:40 +0100 Subject: [PATCH 1/1] [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 5922a4f0408..46034af7526 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 326d4935cfc..8cc35aa7960 100644 --- a/base/setup/usetup/cabinet.c +++ b/base/setup/usetup/cabinet.c @@ -10,6 +10,7 @@ #include "usetup.h" +#define Z_SOLO #include #define NDEBUG -- 2.17.1