mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-22 19:49:28 +00:00
Fix windows installer platform tag
This commit is contained in:
parent
88424c731c
commit
20c9313c6e
4 changed files with 22 additions and 0 deletions
|
@ -16,6 +16,7 @@ option(LOCALMONERO "Include LocalMonero module" ON)
|
||||||
option(XMRIG "Include XMRig module" ON)
|
option(XMRIG "Include XMRig module" ON)
|
||||||
option(TOR_BIN "Path to Tor binary to embed inside Feather" OFF)
|
option(TOR_BIN "Path to Tor binary to embed inside Feather" OFF)
|
||||||
option(CHECK_UPDATES "Enable checking for application updates" 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(USE_DEVICE_TREZOR "Trezor support compilation" ON)
|
||||||
option(DONATE_BEG "Prompt donation window every once in a while" ON)
|
option(DONATE_BEG "Prompt donation window every once in a while" ON)
|
||||||
option(WITH_SCANNER "Enable webcam QR scanner" OFF)
|
option(WITH_SCANNER "Enable webcam QR scanner" OFF)
|
||||||
|
|
14
Makefile
14
Makefile
|
@ -69,6 +69,20 @@ depends:
|
||||||
../../.. && \
|
../../.. && \
|
||||||
$(MAKE)
|
$(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:
|
mac-release:
|
||||||
mkdir -p build && \
|
mkdir -p build && \
|
||||||
cd build && \
|
cd build && \
|
||||||
|
|
|
@ -180,6 +180,10 @@ endif()
|
||||||
# TODO: PLACEHOLDER
|
# TODO: PLACEHOLDER
|
||||||
target_compile_definitions(feather PRIVATE HAS_WEBSOCKET=1)
|
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)
|
if(HAVE_SYS_PRCTL_H)
|
||||||
target_compile_definitions(feather PRIVATE HAVE_SYS_PRCTL_H=1)
|
target_compile_definitions(feather PRIVATE HAVE_SYS_PRCTL_H=1)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -1483,6 +1483,9 @@ QString MainWindow::getPlatformTag() {
|
||||||
return "mac";
|
return "mac";
|
||||||
#endif
|
#endif
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
|
#ifdef PLATFORM_INSTALLER
|
||||||
|
return "win-installer";
|
||||||
|
#endif
|
||||||
return "win";
|
return "win";
|
||||||
#endif
|
#endif
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
|
|
Loading…
Reference in a new issue