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 Jul 12, 2018
1 parent 3842958 commit 36f6595
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dist/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 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 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

Expand Down
2 changes: 1 addition & 1 deletion dist/windows/pack.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 36f6595

Please sign in to comment.