From 36f65950e2de811af5ef0feffcf7a7c70be2a0f0 Mon Sep 17 00:00:00 2001 From: Hannes Matuschek Date: Thu, 12 Jul 2018 13:38:59 +0200 Subject: [PATCH] Fixed Windows build scripts. --- dist/windows/build.bat | 2 +- dist/windows/kochmorse.nsi | 6 +++--- dist/windows/pack.bat | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/windows/build.bat b/dist/windows/build.bat index c9739db..6048925 100644 --- a/dist/windows/build.bat +++ b/dist/windows/build.bat @@ -5,5 +5,5 @@ SET MINGW_PATH=C:/MinGW SET MINGW_BIN_PATH=%MINGW_PATH%/bin SET PATH=%MINGW_BIN_PATH%;%QT_BIN_PATH%;%PATH% -cmake ../.. -G "MinGW Makefiles" -DKOCHMORSE_LIBS="-lportaudio" -DCMAKE_CXX_FLAGS="-I%QT_INCLUDE_PATH%" +cmake ../.. -G "MinGW Makefiles" -DCMAKE_CXX_FLAGS="-I%QT_INCLUDE_PATH%" mingw32-make diff --git a/dist/windows/kochmorse.nsi b/dist/windows/kochmorse.nsi index e277c70..98856e5 100644 --- a/dist/windows/kochmorse.nsi +++ b/dist/windows/kochmorse.nsi @@ -3,15 +3,15 @@ !define DESCRIPTION "A simple morse tutor using the Koch method." # These three must be integers !define VERSIONMAJOR 3 -!define VERSIONMINOR 2 -!define VERSIONBUILD 3 +!define VERSIONMINOR 3 +!define VERSIONBUILD 0 RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on) InstallDir "$PROGRAMFILES\${APPNAME}" Name "${APPNAME}" -outFile "kochmorse-3.2.3-setup.exe" +outFile "kochmorse-3.3.0-setup.exe" !include LogicLib.nsh diff --git a/dist/windows/pack.bat b/dist/windows/pack.bat index 33ad52f..96bce53 100644 --- a/dist/windows/pack.bat +++ b/dist/windows/pack.bat @@ -9,13 +9,13 @@ COPY "src/kochmorse.exe" . COPY "%QT_BIN_PATH%/Qt5Core.dll" . COPY "%QT_BIN_PATH%/Qt5Gui.dll" . COPY "%QT_BIN_PATH%/Qt5Widgets.dll" . +COPY "%QT_BIN_PATH%/Qt5Multimedia.dll" . COPY "%QT_BIN_PATH%/Qt5Svg.dll" . COPY "%QT_BIN_PATH%/Qt5Xml.dll" . COPY "%QT_BIN_PATH%/icuin52.dll" . COPY "%QT_BIN_PATH%/icuuc52.dll" . COPY "%QT_BIN_PATH%/icudt52.dll" . COPY "%QT_BIN_PATH%/libwinpthread-1.dll" . -COPY "%LIB_PATH%/libportaudio-2.dll" . COPY "%LIB_PATH%/libgcc_s_dw2-1.dll" . COPY "%LIB_PATH%/libstdc++-6.dll" . MKDIR platforms