Skip to content

Commit

Permalink
Fixed Windows build scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
hmatuschek committed Jan 10, 2020
1 parent b94a1b7 commit 853ba8f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Below, you will find a list of features of the current KochMorse release.
* A morse tutor using the [Koch method](https://github.com/hmatuschek/kochmorse/wiki/Tutors#koch-tutor).
* A [random morse tutor](https://github.com/hmatuschek/kochmorse/wiki/Tutors#random-tutor) -- Allows to select a set of characters and prosigns for practicing.
* A [QSO tutor](https://github.com/hmatuschek/kochmorse/wiki/Tutors#qso-tutor) -- Generates a random QSO text so you can practice reading typical QSOs.
* A [customized text tutor](https://github.com/hmatuschek/kochmorse/wiki/Tutors#generated-text-tutor) -- This tutor allows you to listen to a plain-text file or to a text
* A [customized text tutor](https://github.com/hmatuschek/kochmorse/wiki/Tutors#generated-text-tutor) -- This tutor allows you to listen to a plain-text file or to a text
[generated](https://github.com/hmatuschek/kochmorse/wiki/TextGen) from user-defined rules.
* A [transmit tutor](https://github.com/hmatuschek/kochmorse/wiki/Tutors#transmit-tutor) -- Connect your practice tone-generator to your microphone input and check your
transmissions with KochMorse.
Expand All @@ -31,7 +31,8 @@ Below, you will find a list of features of the current KochMorse release.
the noise effect, it simulates the conditions on HF bands pretty well.
* QRM effect -- Increases the difficulty to read the morse code by simulating parallel QSOs nearby.

## Releases
## Releases
* 2020-01-10 - [**Version 3.5.0**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.5.0)
* 2018-09-25 - [**Version 3.4.0**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.4.0)
* 2018-06-12 - [**Version 3.3.0**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.3.0)
* 2015-06-30 - [**Version 3.2.2**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.2.2)
Expand All @@ -45,8 +46,6 @@ Below, you will find a list of features of the current KochMorse release.

This is a C++/Qt reimplementation of my "old" python morse-code tutor (also called "kochmorse",
https://kochmorse.googlecode.com). As the "old" implementation relied on ALSA for sound output,
it was restricted to Linux. This reimplementation now uses the Qt5 Multimedia module for the
sound output and the GUI is implemented using Qt5, it is therefore more platform independent
it was restricted to Linux. This reimplementation now uses the Qt5 Multimedia module for the
sound output and the GUI is implemented using Qt5, it is therefore more platform independent
and runs under Linux, MacOS X and Windows.


10 changes: 5 additions & 5 deletions dist/windows/build.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SET QT_PATH=C:/Qt/Qt5.11.1
SET QT_BIN_PATH=%QT_PATH%/5.11.1/mingw53_32/bin
SET QT_INCLUDE_PATH=%QT_PATH%/5.11.1/mingw53_32/include
SET MINGW_PATH=C:/Qt/Qt5.11.1/Tools/mingw530_32
SET QT_PATH=C:/Qt/5.12.6
SET QT_BIN_PATH=%QT_PATH%/mingw73_32/bin
SET QT_INCLUDE_PATH=%QT_PATH%/mingw73_32/include
SET MINGW_PATH=C:/Qt/Tools/mingw730_32/
SET MINGW_BIN_PATH=%MINGW_PATH%/bin
SET CMAKE_BIN_PATH=C:/cmake-3.11.4-win32-x86/bin
SET CMAKE_BIN_PATH=C:/Program\ Files\ (x86)/CMake/bin/bin
SET PATH=%MINGW_BIN_PATH%;%QT_BIN_PATH%;%CMAKE_BIN_PATH%;%PATH%

cmake ../.. -G "MinGW Makefiles" -DCMAKE_CXX_FLAGS="-I%QT_INCLUDE_PATH%"
Expand Down
4 changes: 2 additions & 2 deletions dist/windows/kochmorse.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
!define DESCRIPTION "A simple morse tutor using the Koch method."
# These three must be integers
!define VERSIONMAJOR 3
!define VERSIONMINOR 4
!define VERSIONMINOR 5
!define VERSIONBUILD 0

RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on)

InstallDir "$PROGRAMFILES\${APPNAME}"

Name "${APPNAME}"
outFile "kochmorse-3.4.0-setup.exe"
outFile "kochmorse-3.5.0-setup.exe"

!include LogicLib.nsh

Expand Down
4 changes: 2 additions & 2 deletions dist/windows/pack.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SET QT_LIB_PATH=C:/Qt/Qt5.11.1/5.11.1/mingw53_32/bin
SET QT_PLUGIN_PATH=C:/Qt/Qt5.11.1/5.11.1/mingw53_32/plugins
SET QT_LIB_PATH=C:/Qt/5.12.6/mingw73_32/bin
SET QT_PLUGIN_PATH=C:/Qt/5.12.6/mingw73_32/plugins
SET NSIS_PATH=C:/Program Files (x86)/NSIS
SET PATH=%NSIS_PATH%;%PAHT%

Expand Down

0 comments on commit 853ba8f

Please sign in to comment.