ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update r2 submodule (#1786)

Browse Source
This commit is contained in:
Paul I 2019-09-25 15:36:30 +03:00 committed by xarkes
parent b9be49b884
commit d1d1f97592
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -54,7 +54,7 @@ build_script:
- cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --python ) - cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --python )
after_build: after_build:
- cmd: if defined QMAKE ( xcopy r2_dist_%ARCH%\bin r2_dist_%ARCH% && set "PATH=%CD%\r2_dist_%ARCH%;%PATH%" && powershell scripts\bundle_r2dec.ps1 "%CD%\%ARTIFACT_PATH%" ) - cmd: if defined QMAKE ( set "PATH=%CD%\r2_dist_%ARCH%\bin;%PATH%" && powershell scripts\bundle_r2dec.ps1 "%CD%\%ARTIFACT_PATH%" )
- cmd: if defined QMAKE ( C:\msys64\usr\bin\bash -lc "export PATH=\"/c/msys64/usr/bin:$PATH\" && cd \"$APPVEYOR_BUILD_FOLDER\" && scripts/appveyor_r2ghidra.sh" ) - cmd: if defined QMAKE ( C:\msys64\usr\bin\bash -lc "export PATH=\"/c/msys64/usr/bin:$PATH\" && cd \"$APPVEYOR_BUILD_FOLDER\" && scripts/appveyor_r2ghidra.sh" )
- cmd: powershell scripts\bundle_openssl.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%" - cmd: powershell scripts\bundle_openssl.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%"
- cmd: powershell scripts\bundle_python.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%" - cmd: powershell scripts\bundle_python.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%"

3
prepare_r2.bat
View File

@ -16,6 +16,5 @@ ECHO Building radare2 (%PLATFORM%)
CD radare2 CD radare2
git clean -xfd git clean -xfd
RMDIR /S /Q ..\%R2DIST% RMDIR /S /Q ..\%R2DIST%
python sys\meson.py --release --shared --install=..\%R2DIST% --options "r2_datdir=radare2/share" "r2_libdir=radare2/lib" "c_args=-D_UNICODE -DUNICODE -DCUTTER" python sys\meson.py --release --shared --install=..\%R2DIST% --options "r2_datdir=radare2/share" "r2_libdir=radare2/lib" "c_args=-D_UNICODE -DUNICODE"
IF !ERRORLEVEL! NEQ 0 EXIT /B 1 IF !ERRORLEVEL! NEQ 0 EXIT /B 1
COPY /Y build\shlr\libr2sdb.a ..\%R2DIST%\radare2\lib\r_sdb.lib

2
radare2

@ -1 +1 @@
Subproject commit d112883c5ad7309ca577373639281bb8e57d9988 Subproject commit b263363a91d4f2883d789bbc9a2d8a8321c952ba

7
src/CutterApplication.cpp
View File

@ -118,6 +118,11 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
Python()->initialize(); Python()->initialize();
#endif #endif
#ifdef Q_OS_WIN
// Redefine r_sys_prefix() behaviour
qputenv("R_ALT_SRC_DIR", "1");
#endif
Core()->initialize(); Core()->initialize();
Core()->setSettings(); Core()->setSettings();
Config()->loadInitial(); Config()->loadInitial();
@ -299,7 +304,7 @@ bool CutterApplication::loadTranslations()
trQtBase = nullptr; trQtBase = nullptr;
} }
} }
if (trCutter) { if (trCutter) {
delete trCutter; delete trCutter;
} }

3
src/lib_radare2.pri
View File

@ -32,8 +32,7 @@ win32 {
-lr_socket \ -lr_socket \
-lr_fs \ -lr_fs \
-lr_magic \ -lr_magic \
-lr_crypto \ -lr_crypto
-lr_sdb
} else { } else {
macx|bsd { macx|bsd {
R2PREFIX=/usr/local R2PREFIX=/usr/local