Merge branch 'master' of https://github.com/hmatuschek/kochmorse

dist/windows/build.bat

@@ -1,9 +1,10 @@
-SET QT_PATH=C:/Qt/Qt5.6.3
-SET QT_BIN_PATH=%QT_PATH%/5.6/mingw482_32/bin
-SET QT_INCLUDE_PATH=%QT_PATH%/Tools/mingw482_32/i686-w64-mingw32/include
-SET MINGW_PATH=C:/MinGW
+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 MINGW_BIN_PATH=%MINGW_PATH%/bin
-SET PATH=%MINGW_BIN_PATH%;%QT_BIN_PATH%;%PATH%
+SET CMAKE_BIN_PATH=C:/cmake-3.11.4-win32-x86/bin
+SET PATH=%MINGW_BIN_PATH%;%QT_BIN_PATH%;%CMAKE_BIN_PATH%;%PATH%
 
 cmake ../.. -G "MinGW Makefiles" -DCMAKE_CXX_FLAGS="-I%QT_INCLUDE_PATH%"
 mingw32-make

dist/windows/kochmorse.nsi

@@ -40,6 +40,7 @@ section "install"
 	# Files added here should be removed by the uninstaller (see section "uninstall")
 	file "kochmorse.exe"
 	file "*.dll"
+	file /r "audio"
 	file /r "platforms"
 	file /r "imageformats"
 	file /r "iconengines"
@@ -85,12 +86,14 @@ section "uninstall"
 
 	# Remove files
 	delete $INSTDIR\kochmorse.exe
-    delete $INSTDIR\*.dll
-    delete $INSTDIR\platforms\*.dll
+    	delete $INSTDIR\*.dll
+	delete $INSTDIR\audio\*.dll
+	rmDir $INSTDIR\audio
+	delete $INSTDIR\platforms\*.dll
 	rmDir $INSTDIR\platforms
-    delete $INSTDIR\imageformats\*.dll
+    	delete $INSTDIR\imageformats\*.dll
 	rmDir $INSTDIR\imageformats
-    delete $INSTDIR\iconengines\*.dll
+    	delete $INSTDIR\iconengines\*.dll
 	rmDir $INSTDIR\iconengines
 
 	# Always delete uninstaller as the last action

dist/windows/pack.bat

@@ -1,23 +1,21 @@
-SET PATH=C:/Program Files (x86)/NSIS;%PAHT%
-SET QT_PATH=C:/Qt/Qt5.3.2/5.3/mingw482_32/bin
-SET QT_PLUGIN_PATH=C:/Qt/Qt5.3.2/5.3/mingw482_32/plugins
-SET LIB_PATH=C:/MinGW/bin
+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 NSIS_PATH=C:/Program Files (x86)/NSIS
 SET PATH=%NSIS_PATH%;%PAHT%
 
 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%/libgcc_s_dw2-1.dll" .
-COPY "%LIB_PATH%/libstdc++-6.dll" .
+COPY "%QT_LIB_PATH%/Qt5Core.dll" .
+COPY "%QT_LIB_PATH%/Qt5Gui.dll" .
+COPY "%QT_LIB_PATH%/Qt5Widgets.dll" .
+COPY "%QT_LIB_PATH%/Qt5Multimedia.dll" .
+COPY "%QT_LIB_PATH%/Qt5Network.dll" .
+COPY "%QT_LIB_PATH%/Qt5Svg.dll" .
+COPY "%QT_LIB_PATH%/Qt5Xml.dll" .
+COPY "%QT_LIB_PATH%/libgcc_s_dw2-1.dll" .
+COPY "%QT_LIB_PATH%/libstdc++-6.dll" .
+COPY "%QT_LIB_PATH%/libwinpthread-1.dll" .
+MKDIR audio
+COPY "%QT_PLUGIN_PATH%/audio/qtaudio_windows.dll" audio
 MKDIR platforms
 COPY "%QT_PLUGIN_PATH%/platforms/qwindows.dll" platforms
 MKDIR imageformats