From c40744eba4001eeeb79ec13e04db177e8a652539 Mon Sep 17 00:00:00 2001 From: GustavoLCR Date: Wed, 10 Aug 2022 10:49:17 -0300 Subject: [PATCH] Fix Windows cross build (#2897) * Fix build without ZLIB * Fix cyclic include when cross-compiling * Fixes `rz_util/rz_version.h`->`rz_types.h`->`rz_userconf.h`->`rz_util/rz_version.h` --- librz/include/rz_userconf.h.in | 2 +- librz/util/compression.c | 4 ++++ meson.build | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/librz/include/rz_userconf.h.in b/librz/include/rz_userconf.h.in index a431b97741..28f4428576 100644 --- a/librz/include/rz_userconf.h.in +++ b/librz/include/rz_userconf.h.in @@ -1,7 +1,7 @@ #ifndef RZ_CONFIGURE_H #define RZ_CONFIGURE_H -#include "rz_version.h" +#include "rz_build_version.h" // clang-format off #define RZ_CHECKS_LEVEL @RZ_CHECKS_LEVEL@ diff --git a/librz/util/compression.c b/librz/util/compression.c index c44de2337e..3592c4ba87 100644 --- a/librz/util/compression.c +++ b/librz/util/compression.c @@ -2,7 +2,11 @@ // SPDX-License-Identifier: LGPL-3.0-only #include +#if HAVE_ZLIB #include +#else +#define MAX_WBITS 15 +#endif #if HAVE_LZMA #include diff --git a/meson.build b/meson.build index f049a34304..f3b61fde2a 100644 --- a/meson.build +++ b/meson.build @@ -513,7 +513,7 @@ if packager_version != '' endif rz_version_h = configure_file( input: 'librz/include/rz_version.h.in', - output: 'rz_version.h', + output: 'rz_build_version.h', configuration: versionconf, install_dir: rizin_incdir )