From 42d8649f59d16595161a032807cd5aaa2b8b5ea7 Mon Sep 17 00:00:00 2001 From: bdr Date: Tue, 16 Oct 2018 19:18:56 -0700 Subject: [PATCH] Windows compile tweaks --- src/precompiled.h | 2 ++ src/scripts/mkwinrelease.ps1 | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/precompiled.h b/src/precompiled.h index 1d4bc7e..1eacdee 100644 --- a/src/precompiled.h +++ b/src/precompiled.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/src/scripts/mkwinrelease.ps1 b/src/scripts/mkwinrelease.ps1 index 8ed36fc..044ad66 100644 --- a/src/scripts/mkwinrelease.ps1 +++ b/src/scripts/mkwinrelease.ps1 @@ -1,4 +1,4 @@ -if (-not (Test-Path env:QT_LOCATION)) { echo "QT_LOCATION is not set"; exit; } +if (-not (Test-Path env:QT_STATIC)) { echo "QT_STATIC is not set"; exit; } if (-not (Test-Path env:APP_VERSION)) { echo "APP_VERSION is not set"; exit; } $target="zcash-qt-wallet-v$Env:APP_VERSION" @@ -10,7 +10,7 @@ Remove-Item -Path release -Recurse | Out-Null # Run qmake echo "Configuring" -& "$Env:QT_LOCATION\bin\qmake.exe" zcash-qt-wallet.pro -spec win32-msvc "CONFIG+=release" +& "$Env:QT_STATIC\bin\qmake.exe" zcash-qt-wallet.pro -spec win32-msvc "CONFIG+=release" echo "Building" nmake *>$null @@ -19,7 +19,7 @@ nmake *>$null New-Item release/$target -itemtype directory | Out-Null Move-Item release/zcash-qt-wallet.exe release/$target | Out-Null -& "$Env:QT_LOCATION\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null +& "$Env:QT_STATIC\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null echo "Zipping" Compress-Archive -LiteralPath release/$target -DestinationPath "release/$target.zip" \ No newline at end of file