Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-06 13:29:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix meson build

Browse Source
This commit is contained in:
xarkes 2017-08-10 10:18:12 +02:00
parent 4b214d8627
commit 96f1e821a2
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/core/cmd_debug.c
View File

@ -11,7 +11,6 @@
#include "r_heap_glibc.h"
#endif
#define HAVE_JEMALLOC 1
#if HAVE_JEMALLOC
#include "r_heap_jemalloc.h"
#include "linux_heap_jemalloc.c"

11
libr/core/meson.build
View File

@ -58,11 +58,14 @@ files=[
'vmenus.c',
'yank.c'
]
includes = ['../../shlr']
if host_machine.system() != 'windows'
includes += ['../../shlr/heap/include']
endif
r_core = library('r_core', files,
include_directories: [platform_inc, include_directories([
'../../shlr',
'../../shlr/heap/include'
])],
include_directories: [platform_inc, include_directories(includes)],
c_args: ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin, r_asm, r_bp],
objects: [

2
libr/include/r_userconf.h.acr
View File

@ -29,4 +29,6 @@
#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
#define HAVE_JEMALLOC @HAVE_JEMALLOC@
#endif

2
libr/include/r_userconf.h.in
View File

@ -29,4 +29,6 @@
#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
#define HAVE_JEMALLOC @HAVE_JEMALLOC@
#endif

5
meson.build
View File

@ -107,6 +107,11 @@ userconf.set('USE_LIB_MAGIC', 0)
userconf.set('HAVE_OPENSSL', 0)
userconf.set('HAVE_FORK', 1)
userconf.set('WITH_GPL', 1)
if host_machine.system() == 'windows'
userconf.set('HAVE_JEMALLOC', 0)
else
userconf.set('HAVE_JEMALLOC', 1)
endif
configure_file(input : 'libr/include/r_userconf.h.in',
output : 'r_userconf.h',
configuration : userconf)