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`
This commit is contained in:
parent
a9c59ce1dd
commit
c40744eba4
3 changed files with 6 additions and 2 deletions
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -2,7 +2,11 @@
|
|||
// SPDX-License-Identifier: LGPL-3.0-only
|
||||
|
||||
#include <rz_util.h>
|
||||
#if HAVE_ZLIB
|
||||
#include <zlib.h>
|
||||
#else
|
||||
#define MAX_WBITS 15
|
||||
#endif
|
||||
|
||||
#if HAVE_LZMA
|
||||
#include <lzma.h>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue