From 2ff84a3abec28423f3823aea7312f09fcf26f4c1 Mon Sep 17 00:00:00 2001 From: Paul I Date: Mon, 23 Jul 2018 21:36:14 +0300 Subject: [PATCH] Update radare2 and fix prepare_r2.bat (#590) * Fix prepare_r2.bat * Update radare2 submodule --- prepare_r2.bat | 2 +- radare2 | 2 +- src/lib_radare2.pri | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prepare_r2.bat b/prepare_r2.bat index afecd098..d59e7702 100644 --- a/prepare_r2.bat +++ b/prepare_r2.bat @@ -18,4 +18,4 @@ git clean -xfd RMDIR /S /Q ..\%R2DIST% python sys\meson.py --release --shared --install=..\%R2DIST% --options r2_datdir=radare2/share IF !ERRORLEVEL! NEQ 0 EXIT /B 1 -REN ..\%R2DIST%\lib\libr_shlr.a r_shlr.lib +COPY /Y build\shlr\libr2sdb.a ..\%R2DIST%\lib\r_sdb.lib diff --git a/radare2 b/radare2 index dfa196dd..b50080b3 160000 --- a/radare2 +++ b/radare2 @@ -1 +1 @@ -Subproject commit dfa196ddd270b31aab11eb0cb4d931a2bff24db9 +Subproject commit b50080b363b842ba26cc16416e8a29d4c1ca20a7 diff --git a/src/lib_radare2.pri b/src/lib_radare2.pri index 98224069..32c731ea 100644 --- a/src/lib_radare2.pri +++ b/src/lib_radare2.pri @@ -33,7 +33,7 @@ win32 { -lr_fs \ -lr_magic \ -lr_crypto \ - -lr_shlr + -lr_sdb } else { macx { PREFIX=/usr/local