Minor build fixes and version bump

allanrbo · Jul 21, 2022 · 6ff21fd · 6ff21fd
1 parent 6b3ac3b
commit 6ff21fd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(filesremote VERSION 1.7 LANGUAGES CXX)
+project(filesremote VERSION 1.8 LANGUAGES CXX)
 
 SET(CMAKE_CXX_STANDARD 17)
 

diff --git a/README.DEVELOPER.md b/README.DEVELOPER.md
@@ -6,7 +6,7 @@ Development
 Get and build the 3rd party dependencies:
 
     # Only on Linux:
-        sudo apt install libssl-dev libsecret-1-dev libgtk-3-dev
+        sudo apt install libssl-dev libsecret-1-dev libgtk-3-dev cmake
 
     # Only on macOS:
         xcode-select --install
@@ -23,7 +23,6 @@ Get and build the 3rd party dependencies:
         pacman -S mingw-w64-x86_64-toolchain
         pacman -S cmake
         pacman -S git
-
         export PATH="/mingw64/bin:$PATH"
 
 
@@ -36,7 +35,12 @@ Get and build the 3rd party dependencies:
     curl -L -O https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2
     tar -v -xjf wxWidgets-3.1.4.tar.bz2
     cd wxWidgets-3.1.4/
-    ./configure --disable-shared --enable-unicode --without-libjpeg --without-libtiff --with-macosx-version-min=10.13
+    # Mac
+        ./configure --disable-shared --enable-unicode --without-libjpeg --without-libtiff --with-macosx-version-min=10.13
+    # Windows
+        ./configure --disable-shared --enable-unicode --without-libjpeg --without-libtiff --with-msw --build=x86-winnt-mingw32
+    # Linux
+        ./configure --disable-shared --enable-unicode --without-libjpeg --without-libtiff
     # Optional for step-debugging into wxWidgets funcs: --enable-debug
     make -j4
 
@@ -50,7 +54,10 @@ Get and build the 3rd party dependencies:
         export CFLAGS=-mmacosx-version-min=10.13
         export LDFLAGS=-mmacosx-version-min=10.13
     fi
-    ./config
+    # Windows
+        ./configure mingw64
+    # Mac and Linux
+        ./config
     make -j4
 
 

diff --git a/src/sftpconnection.cpp b/src/sftpconnection.cpp
@@ -666,7 +666,7 @@ static void kbd_callback(
         LIBSSH2_USERAUTH_KBDINT_RESPONSE *responses,
         void **abstract) {
     // Assume that the keyboard-interactive will simply be a single password prompt.
-    if (num_prompts != 1 || !regex_search(string(prompts[0].text, prompts[0].length), regex("[Pp]assword"))) {
+    if (num_prompts != 1 || !regex_search(string((const char*)prompts[0].text, prompts[0].length), regex("[Pp]assword"))) {
         return;
     }