Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-29 17:33:08 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Adding files to meson + windows env refactor

Browse Source
This commit is contained in:
xarkes 2017-06-20 11:12:42 +02:00 committed by Anton Kochkov
parent 8e5f2154b2
commit ca5a68ebb3
6 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binr/rabin2/meson.build
View File

@ -1,7 +1,7 @@
executable('rabin2', 'rabin2.c',
include_directories: [platform_inc],
link_with: [r_util, r_cons, r_config, r_hash, r_io, r_crypto, r_core, r_magic],
link_with: [r_util, r_cons, r_config, r_hash, r_io, r_crypto, r_core, r_magic, libr2java],
objects: [
libr2sdb.extract_all_objects(),
r_bin.extract_all_objects()

8
libr/anal/meson.build
View File

@ -61,12 +61,12 @@ files=[
'p/anal_vax.c',
'p/anal_ws.c',
'p/anal_x86_cs.c',
#'p/anal_x86_udis.c',
'p/anal_x86_udis.c',
'p/anal_xap.c',
'p/anal_xcore_cs.c',
#'p/anal_xtensa.c',
'p/anal_z80.c',
#'p/esil_x86_udis.c',
'p/esil_x86_udis.c',
'pin.c',
'ref.c',
'reflines.c',
@ -83,7 +83,7 @@ files=[
r_anal = shared_library('r_anal', files,
include_directories: [platform_inc, include_directories([
'arch/gb',
'../asm/arch/8051',
'../asm/arch/8051',
'../asm/arch/cr16',
'../asm/arch/include/',
'../../shlr/capstone/include',
@ -91,7 +91,7 @@ r_anal = shared_library('r_anal', files,
])],
c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
link_with: [r_util, r_reg, r_syscall, r_search, r_cons],
link_with: [r_util, r_reg, r_syscall, r_search, r_cons, libr2udis86],
objects: [
libr2capstone.extract_all_objects(),
libr2sdb.extract_all_objects(),

4
libr/asm/meson.build
View File

@ -21,7 +21,7 @@ files=[
'p/asm_hppa_gnu.c',
'p/asm_i4004.c',
'p/asm_i8080.c',
#'p/asm_java.c',
'p/asm_java.c',
'p/asm_lanai_gnu.c',
'p/asm_lh5801.c',
'p/asm_lm32.c',
@ -156,7 +156,7 @@ r_asm = shared_library('r_asm', files,
'arch/8051',
])],
c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
link_with: [r_util, r_syscall, r_parse, r_lang, r_flag, r_socket, libr2udis86],
link_with: [r_util, r_syscall, r_parse, r_lang, r_flag, r_socket, libr2java, libr2udis86],
objects: [
libr2capstone.extract_all_objects(),
libr2sdb.extract_all_objects(),

4
libr/bin/meson.build
View File

@ -23,7 +23,7 @@ files=[
'p/bin_elf.c',
'p/bin_elf64.c',
'p/bin_fs.c',
#'p/bin_java.c',
'p/bin_java.c',
'p/bin_mach0.c',
'p/bin_mach064.c',
'p/bin_mbn.c',
@ -110,7 +110,7 @@ r_bin = shared_library('r_bin', files,
'format'
])],
c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
link_with: [r_util, r_io, r_socket, r_magic],
link_with: [r_util, r_io, r_socket, r_magic, libr2java],
objects: [
libr2sdb.extract_all_objects()
],

7
libr/core/core.c
View File

@ -1532,13 +1532,12 @@ R_API const char *r_core_anal_optype_colorfor(RCore *core, ut64 addr, bool verbo
static void r_core_setenv (RCore *core) {
char *e = r_sys_getenv ("PATH");
char *h = r_str_home (".config/radare2/prefix/bin");
#if __WINDOWS__ && !__CYGWIN__
char sep = ';';
char *h = r_str_home(".config\\radare2\\prefix\\bin;");
#else
char sep = ':';
char *h = r_str_home(".config/radare2/prefix/bin:");
#endif
char *n = r_str_newf ("%s%c%s", h, sep, e);
char *n = r_str_newf ("%s%s", h, e);
r_sys_setenv ("PATH", n);
free (n);
free (h);

26
shlr/meson.build
View File

@ -30,19 +30,19 @@ libr2gdb = static_library('libr2gdb', gdb_files,
])]
)
#java_files=[
#'java/class.c',
#'java/code.c',
#'java/dsojson.c',
#'java/ops.c',
##'java/main.c',
#]
#
#libr2java = static_library('libr2java', java_files,
# include_directories: [platform_inc, include_directories([
# 'java'
# ])]
#)
java_files=[
'java/class.c',
'java/code.c',
'java/dsojson.c',
'java/ops.c',
#'java/main.c',
]
libr2java = static_library('libr2java', java_files,
include_directories: [platform_inc, include_directories([
'java'
])]
)
qnx_files=[
'qnx/src/core.c',