From 20c9313c6e06f6bc7671193e7ed99c824e113383 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 29 Oct 2021 13:54:13 +0200 Subject: [PATCH] Fix windows installer platform tag --- CMakeLists.txt | 1 + Makefile | 14 ++++++++++++++ src/CMakeLists.txt | 4 ++++ src/MainWindow.cpp | 3 +++ 4 files changed, 22 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c185917..d498eb5 100644 --- 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 5a63372..3924f56 100644 --- 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 fdbbd7c..6dc11ce 100644 --- 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 0dfcbb0..e45fb78 100644 --- 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