luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing Qt6 builds for MINGW

This commit is contained in:
Matthias Koefferlein 2024-04-15 00:23:25 +02:00
parent 030ee37f64
commit 7ea313a722
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/deploy-win-mingw.sh
View File

@ -116,7 +116,7 @@ src=$pwd/src
scripts=$pwd/scripts
# Update in NSIS script too:
plugins="audio generic iconengines imageformats platforms printsupport sqldrivers styles"
plugins="audio generic iconengines imageformats multimedia networkinformation platforms printsupport sqldrivers styles tls"
# read the current version
. ./version.sh
@ -157,12 +157,14 @@ cp $mingw_inst/etc/ssl/cert.pem $target
echo "Installing plugins .."
for p in $plugins; do
echo " $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p .."
cp -R $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p $target
# remove the debug versions - otherwise they pull in the debug Qt libs
shopt -s nullglob
rm -f $target/$p/*d.dll $target/$p/*.dll.debug
shopt -u nullglob
if [ -e $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p ]; then
echo " $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p .."
cp -R $mingw_inst/share/$KLAYOUT_BUILD_QT/plugins/$p $target
# remove the debug versions - otherwise they pull in the debug Qt libs
shopt -s nullglob
rm -f $target/$p/*d.dll $target/$p/*.dll.debug
shopt -u nullglob
fi
done
# ----------------------------------------------------------

16
scripts/deploy-win-ucrt64.sh
View File

@ -99,7 +99,7 @@ build=$pwd/build-release-$arch$KLAYOUT_BUILD_SUFFIX
src=$pwd/src
scripts=$pwd/scripts
# Update in NSIS script too:
plugins="audio generic iconengines imageformats platforms printsupport sqldrivers styles"
plugins="audio generic iconengines imageformats multimedia networkinformation platforms printsupport sqldrivers styles tls"
# read the current version
. ./version.sh
@ -141,11 +141,13 @@ cp $ucrt_inst/etc/ssl/cert.pem $target
echo "Installing plugins .."
for p in $plugins; do
cp -R $ucrt_inst/share/qt5/plugins/$p $target
# remove the debug versions - otherwise they pull in the debug Qt libs
shopt -s nullglob
rm -f $target/$p/*d.dll $target/$p/*.dll.debug
shopt -u nullglob
if [ -e $ucrt_inst/share/qt5/plugins/$p ]; then
cp -R $ucrt_inst/share/qt5/plugins/$p $target
# remove the debug versions - otherwise they pull in the debug Qt libs
shopt -s nullglob
rm -f $target/$p/*d.dll $target/$p/*.dll.debug
shopt -u nullglob
fi
done
# ----------------------------------------------------------
@ -264,7 +266,7 @@ while [ "$new_libs" != "" ]; do
cp $ucrt_inst/bin/$l $l
new_libs="$new_libs $l"
elif [ -e "${ucrt_vssdk}/$l" ] && ! [ -e $l ]; then
echo "Copying binary installation partial $ucrt_inst/bin/$l -> $l"
echo "Copying binary installation partial ${ucrt_vssdk}/${l} -> $l"
cp "${ucrt_vssdk}/${l}" "$l"
new_libs="$new_libs $l"
fi

3
scripts/klayout-inst.nsis
View File

@ -76,10 +76,13 @@ section
file /r generic
file /r iconengines
file /r imageformats
file /r multimedia
file /r networkinformation
file /r platforms
file /r printsupport
file /r sqldrivers
file /r styles
file /r tls
file /r lib
file /oname=${EXENAME}.exe ${EXEBASE}.exe
file /oname=${EXENAME_VO}.exe ${EXEBASE}.exe