Fix windows installer platform tag

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1859179f65f632ae98e65bf6c5d8b943eba7eb8..d498eb50a0c67862022c2c1e474b666c6b2f3446 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ option(LOCALMONERO "Include LocalMonero module" ON)
 option(XMRIG "Include XMRig module" ON)
 option(TOR_BIN "Path to Tor binary to embed inside Feather" OFF)
 option(CHECK_UPDATES "Enable checking for application updates" OFF)
+option(PLATFORM_INSTALLER "Built-in updater fetches installer (windows-only)" OFF)
 option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
 option(DONATE_BEG "Prompt donation window every once in a while" ON)
 option(WITH_SCANNER "Enable webcam QR scanner" OFF)

diff --git a/Makefile b/Makefile
index 5a633726cbe4594f3be5d9ba17c2adf424e846c4..3924f5637ca6cf11faa0b518c5a3e56c0b8ae0a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,20 @@ depends:
                ../../.. && \
        $(MAKE)
 
+win-installer:
+       mkdir -p build/$(target)/release && \
+       cd build/$(target)/release && \
+       cmake \
+           -D PLATFORM_INSTALLER=On \
+               -DARCH=x86-64 \
+               -D BUILD_TAG=$(tag) \
+               -D CMAKE_BUILD_TYPE=Release \
+               -D STATIC=ON \
+               -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake \
+               $(CMAKEFLAGS) \
+               ../../.. && \
+       $(MAKE)
+
 mac-release:
        mkdir -p build && \
        cd build && \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fdbbd7cd7a49838c17ee16f03a9b57112809cd27..6dc11ced588c47f3cc1bc4e47d8985df9b574db6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -180,6 +180,10 @@ endif()
 # TODO: PLACEHOLDER
 target_compile_definitions(feather PRIVATE HAS_WEBSOCKET=1)
 
+if(PLATFORM_INSTALLER)
+    target_compile_definitions(feather PRIVATE PLATFORM_INSTALLER=1)
+endif()
+
 if(HAVE_SYS_PRCTL_H)
     target_compile_definitions(feather PRIVATE HAVE_SYS_PRCTL_H=1)
 endif()

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 0dfcbb0df0802bf260acf37e5540c79701c6efe1..e45fb786893d4da6de6bce83fb99b61f7e58daa4 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1483,6 +1483,9 @@ QString MainWindow::getPlatformTag() {
     return "mac";
 #endif
 #ifdef Q_OS_WIN
+#ifdef PLATFORM_INSTALLER
+    return "win-installer";
+#endif
     return "win";
 #endif
 #ifdef Q_OS_LINUX