Skip to content

Commit 3bcb3a0

Browse files
committed
Fix Windows installer bundle creation
1 parent ce993e4 commit 3bcb3a0

File tree

2 files changed

+46
-8
lines changed

2 files changed

+46
-8
lines changed

build/windows/make-exe_32.sh

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ cp $APP_BIN_DIR/starcapp.exe $EXE_APP_DIR
2727
cp $APP_BIN_DIR/corelib.dll $EXE_APP_DIR
2828
cp $APP_BIN_DIR/plugins/*.dll $EXE_APP_DIR/plugins/
2929

30+
#
31+
# Run windeployqt tool
32+
#
33+
$Qt5_Dir/bin/windeployqt.exe $EXE_APP_DIR/starcapp.exe
34+
35+
#
36+
# Remove Qt translations
37+
#
38+
rm -rf $EXE_APP_DIR/translations
39+
3040
#
3141
# Copy Qt libraries
3242
#
@@ -46,15 +56,24 @@ cp $Qt5_Dir/bin/Qt5Xml.dll $EXE_APP_DIR/
4656
# Copy Qt plugins
4757
#
4858
mkdir $EXE_APP_DIR/audio
49-
cp $Qt5_Dir/plugins/audio/*.dll $EXE_APP_DIR/audio/
59+
cp $Qt5_Dir/plugins/audio/qtaudio_wasapi.dll $EXE_APP_DIR/audio/
60+
cp $Qt5_Dir/plugins/audio/qtaudio_windows.dll $EXE_APP_DIR/audio/
5061
mkdir $EXE_APP_DIR/iconengines
51-
cp $Qt5_Dir/plugins/iconengines/*.dll $EXE_APP_DIR/iconengines/
62+
cp $Qt5_Dir/plugins/iconengines/qsvgicon.dll $EXE_APP_DIR/iconengines/
5263
mkdir $EXE_APP_DIR/imageformats
53-
cp $Qt5_Dir/plugins/imageformats/*.dll $EXE_APP_DIR/imageformats/
64+
cp $Qt5_Dir/plugins/imageformats/qgif.dll $EXE_APP_DIR/imageformats/
65+
cp $Qt5_Dir/plugins/imageformats/qicns.dll $EXE_APP_DIR/imageformats/
66+
cp $Qt5_Dir/plugins/imageformats/qico.dll $EXE_APP_DIR/imageformats/
67+
cp $Qt5_Dir/plugins/imageformats/qjpeg.dll $EXE_APP_DIR/imageformats/
68+
cp $Qt5_Dir/plugins/imageformats/qsvg.dll $EXE_APP_DIR/imageformats/
69+
cp $Qt5_Dir/plugins/imageformats/qtga.dll $EXE_APP_DIR/imageformats/
70+
cp $Qt5_Dir/plugins/imageformats/qtiff.dll $EXE_APP_DIR/imageformats/
71+
cp $Qt5_Dir/plugins/imageformats/qwbmp.dll $EXE_APP_DIR/imageformats/
72+
cp $Qt5_Dir/plugins/imageformats/qwebp.dll $EXE_APP_DIR/imageformats/
5473
mkdir $EXE_APP_DIR/platforms
5574
cp $Qt5_Dir/plugins/platforms/qwindows.dll $EXE_APP_DIR/platforms/
5675
mkdir $EXE_APP_DIR/printsupport
57-
cp $Qt5_Dir/plugins/printsupport/*.dll $EXE_APP_DIR/printsupport/
76+
cp $Qt5_Dir/plugins/printsupport/windowsprintersupport.dll $EXE_APP_DIR/printsupport/
5877
mkdir $EXE_APP_DIR/sqldrivers
5978
cp $Qt5_Dir/plugins/sqldrivers/qsqlite.dll $EXE_APP_DIR/sqldrivers/
6079
#

build/windows/make-exe_64.sh

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ cp $APP_BIN_DIR/starcapp.exe $EXE_APP_DIR
2727
cp $APP_BIN_DIR/corelib.dll $EXE_APP_DIR
2828
cp $APP_BIN_DIR/plugins/*.dll $EXE_APP_DIR/plugins/
2929

30+
#
31+
# Run windeployqt tool
32+
#
33+
$Qt5_Dir/bin/windeployqt.exe $EXE_APP_DIR/starcapp.exe
34+
35+
#
36+
# Remove Qt translations
37+
#
38+
rm -rf $EXE_APP_DIR/translations
39+
3040
#
3141
# Copy Qt libraries
3242
#
@@ -46,15 +56,24 @@ cp $Qt5_Dir/bin/Qt5Xml.dll $EXE_APP_DIR/
4656
# Copy Qt plugins
4757
#
4858
mkdir $EXE_APP_DIR/audio
49-
cp $Qt5_Dir/plugins/audio/*.dll $EXE_APP_DIR/audio/
59+
cp $Qt5_Dir/plugins/audio/qtaudio_wasapi.dll $EXE_APP_DIR/audio/
60+
cp $Qt5_Dir/plugins/audio/qtaudio_windows.dll $EXE_APP_DIR/audio/
5061
mkdir $EXE_APP_DIR/iconengines
51-
cp $Qt5_Dir/plugins/iconengines/*.dll $EXE_APP_DIR/iconengines/
62+
cp $Qt5_Dir/plugins/iconengines/qsvgicon.dll $EXE_APP_DIR/iconengines/
5263
mkdir $EXE_APP_DIR/imageformats
53-
cp $Qt5_Dir/plugins/imageformats/*.dll $EXE_APP_DIR/imageformats/
64+
cp $Qt5_Dir/plugins/imageformats/qgif.dll $EXE_APP_DIR/imageformats/
65+
cp $Qt5_Dir/plugins/imageformats/qicns.dll $EXE_APP_DIR/imageformats/
66+
cp $Qt5_Dir/plugins/imageformats/qico.dll $EXE_APP_DIR/imageformats/
67+
cp $Qt5_Dir/plugins/imageformats/qjpeg.dll $EXE_APP_DIR/imageformats/
68+
cp $Qt5_Dir/plugins/imageformats/qsvg.dll $EXE_APP_DIR/imageformats/
69+
cp $Qt5_Dir/plugins/imageformats/qtga.dll $EXE_APP_DIR/imageformats/
70+
cp $Qt5_Dir/plugins/imageformats/qtiff.dll $EXE_APP_DIR/imageformats/
71+
cp $Qt5_Dir/plugins/imageformats/qwbmp.dll $EXE_APP_DIR/imageformats/
72+
cp $Qt5_Dir/plugins/imageformats/qwebp.dll $EXE_APP_DIR/imageformats/
5473
mkdir $EXE_APP_DIR/platforms
5574
cp $Qt5_Dir/plugins/platforms/qwindows.dll $EXE_APP_DIR/platforms/
5675
mkdir $EXE_APP_DIR/printsupport
57-
cp $Qt5_Dir/plugins/printsupport/*.dll $EXE_APP_DIR/printsupport/
76+
cp $Qt5_Dir/plugins/printsupport/windowsprintersupport.dll $EXE_APP_DIR/printsupport/
5877
mkdir $EXE_APP_DIR/sqldrivers
5978
cp $Qt5_Dir/plugins/sqldrivers/qsqlite.dll $EXE_APP_DIR/sqldrivers/
6079
#

0 commit comments

Comments
 (0)