From d1d1f97592400477ae03676cbb1eaa7d02be8842 Mon Sep 17 00:00:00 2001
From: Paul I <pelijah@users.noreply.github.com>
Date: Wed, 25 Sep 2019 15:36:30 +0300
Subject: [PATCH] Update r2 submodule (#1786)

---
 .appveyor.yml             | 2 +-
 prepare_r2.bat            | 3 +--
 radare2                   | 2 +-
 src/CutterApplication.cpp | 7 ++++++-
 src/lib_radare2.pri       | 3 +--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 5d0c6cc0..790e5940 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -54,7 +54,7 @@ build_script:
   - cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --python )
 
 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: powershell scripts\bundle_openssl.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%"
   - cmd: powershell scripts\bundle_python.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%"
diff --git a/prepare_r2.bat b/prepare_r2.bat
index 6adc81d5..85b8e0fe 100644
--- a/prepare_r2.bat
+++ b/prepare_r2.bat
@@ -16,6 +16,5 @@ ECHO Building radare2 (%PLATFORM%)
 CD radare2
 git clean -xfd
 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
-COPY /Y build\shlr\libr2sdb.a ..\%R2DIST%\radare2\lib\r_sdb.lib
diff --git a/radare2 b/radare2
index d112883c..b263363a 160000
--- a/radare2
+++ b/radare2
@@ -1 +1 @@
-Subproject commit d112883c5ad7309ca577373639281bb8e57d9988
+Subproject commit b263363a91d4f2883d789bbc9a2d8a8321c952ba
diff --git a/src/CutterApplication.cpp b/src/CutterApplication.cpp
index b4c7299b..762a6f7a 100644
--- a/src/CutterApplication.cpp
+++ b/src/CutterApplication.cpp
@@ -118,6 +118,11 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
     Python()->initialize();
 #endif
 
+#ifdef Q_OS_WIN
+    // Redefine r_sys_prefix() behaviour
+    qputenv("R_ALT_SRC_DIR", "1");
+#endif
+
     Core()->initialize();
     Core()->setSettings();
     Config()->loadInitial();
@@ -299,7 +304,7 @@ bool CutterApplication::loadTranslations()
                     trQtBase = nullptr;
                 }
             }
-            
+
             if (trCutter) {
                 delete trCutter;
             }
diff --git a/src/lib_radare2.pri b/src/lib_radare2.pri
index f747c6ee..7af051fc 100644
--- a/src/lib_radare2.pri
+++ b/src/lib_radare2.pri
@@ -32,8 +32,7 @@ win32 {
         -lr_socket \
         -lr_fs \
         -lr_magic \
-        -lr_crypto \
-        -lr_sdb
+        -lr_crypto
 } else {
     macx|bsd {
         R2PREFIX=/usr/local