utils: Update deployment scripts

irydacea · Apr 24, 2024 · c54bae0 · c54bae0
1 parent 60edef4
commit c54bae0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/utils/build-qt-windows-static.cmd b/utils/build-qt-windows-static.cmd
@@ -8,14 +8,14 @@ rem
 
 setlocal
 
-set qtsrcdir=C:\Qt\6.6.3\Src
+set qtsrcdir=C:\Qt\6.7.0\Src
 set mingwpath=C:\Qt\Tools\mingw1120_64\bin
 
 set cmakepath=C:\Qt\Tools\CMake_64\bin
 set ninjapath=C:\Qt\Tools\Ninja
 
-set distdir=..\dist\windows-qt-6.6.3-static
-set builddir=.\qt-build-windows-6.6.3-static
+set distdir=..\dist\windows-qt-6.7.0-static
+set builddir=.\qt-build-windows-6.7.0-static
 
 rem
 rem Set up development environment
@@ -35,7 +35,7 @@ rem
 rem Configure Qt
 rem
 
-call %qtsrcdir%\configure -prefix %distdir% -release -optimize-size -static -static-runtime -submodules qtbase,qtimageformats -no-feature-network -no-feature-sql -no-feature-printer -no-feature-printsupport -no-feature-androiddeployqt -no-feature-qdbus -no-feature-concurrent -no-feature-testlib -no-feature-xml -no-feature-qmake -gui -widgets -no-opengl -no-gif -no-tiff -no-dbus
+call %qtsrcdir%\configure -prefix %distdir% -release -optimize-size -static -static-runtime -submodules qtbase,qtimageformats,qt5compat -no-feature-network -no-feature-sql -no-feature-printer -no-feature-printsupport -no-feature-androiddeployqt -no-feature-qdbus -no-feature-concurrent -no-feature-testlib -no-feature-xml -no-feature-qmake -gui -widgets -no-opengl -no-gif -no-tiff -no-dbus -no-openssl -no-ssl -qt-zlib
 
 if not %errorlevel% equ 0 goto configfail
 

diff --git a/utils/dist-mac b/utils/dist-mac
@@ -12,7 +12,7 @@ bundle=wespal.app
 image=wespal.dmg
 image_final=Wespal-$version.dmg
 
-qtdir="$HOME/Local/Qt/6.6.3"
+qtdir="$HOME/Local/Qt/6.7.0"
 qtcmakedir="$HOME/Local/Qt/Tools/CMake"
 
 cmake="$qtdir/macos/bin/qt-cmake"
@@ -40,7 +40,7 @@ cd $builddir
 # Configure and build the app
 #
 
-$cmake -S .. -B . -G Ninja -DCMAKE_OSX_ARCHITECTURES='x86_64;arm64' -DCMAKE_BUILD_TYPE=Release
+$cmake -S .. -B . -G Ninja -DCMAKE_OSX_ARCHITECTURES='x86_64;arm64' -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_IMAGE_PLUGINS=ON
 ninja
 
 #

diff --git a/utils/dist-windows.cmd b/utils/dist-windows.cmd
@@ -22,16 +22,16 @@ goto baddevenv
 
 :vs
 rem Visual Studio 2022 host
-set qtprefix=C:\Qt\6.6.3\msvc2019_64
+set qtprefix=C:\Qt\6.7.0\msvc2019_64
 set devenvcmd="C:\Program Files\Microsoft Visual Studio\2022\Community"\VC\Auxiliary\Build\vcvars64.bat
 goto common
 
 :static
 :mingw
 rem Mingw host
-set qtprefix=C:\Qt\6.6.3\mingw_64
+set qtprefix=C:\Qt\6.7.0\mingw_64
 rem Static-linked version
-if .%devenv%==.static set qtprefix=..\dist\windows-qt-6.6.3-static
+if .%devenv%==.static set qtprefix=..\dist\windows-qt-6.7.0-static
 set PATH=C:\Qt\Tools\mingw1120_64\bin;%PATH%
 goto common
 
@@ -62,7 +62,7 @@ rem
 rem Configure and build the app
 rem
 
-cmake -S .. -B . -G Ninja -DCMAKE_BUILD_TYPE=Release
+cmake -S .. -B . -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_IMAGE_PLUGINS=ON -DQUAZIP_USE_QT_ZLIB=ON
 ninja
 
 rem