deps.qt: Add support for Windows ARM64

obsproject · Feb 27, 2023 · bbd723f · bbd723f
1 parent 4fd89ba
commit bbd723f
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 7 deletions.
diff --git a/Build-Dependencies.ps1 b/Build-Dependencies.ps1
@@ -11,7 +11,8 @@ param(
     [switch] $SkipAll,
     [switch] $SkipBuild,
     [switch] $SkipDeps,
-    [switch] $SkipUnpack
+    [switch] $SkipUnpack,
+    [string] $QtHostPath = $Env:Qt6_DIR
 )
 
 $ErrorActionPreference = "Stop"
@@ -170,6 +171,10 @@ function Build-Main {
         $script:PackageName = 'qt5'
     } elseif ( $Dependencies -eq 'qt6' ) {
         $script:PackageName = 'qt6'
+
+        if ( $Target -eq 'arm64' ) {
+            $script:QtHostPath = $QtHostPath
+        }
     }
 
     $UtilityFunctions = Get-ChildItem -Path $PSScriptRoot/utils.pwsh/*.ps1 -Recurse

diff --git a/deps.qt/qt5.ps1 b/deps.qt/qt5.ps1
@@ -8,7 +8,8 @@ param(
             PatchFile = "${PSScriptRoot}/patches/Qt5/win/0001-QTBUG-74606.patch"
             HashSum = "BAE8765FC74FB398BC3967AD82760856EE308E643A8460C324D36A4D07063001"
         }
-    )
+    ),
+    [array] $Targets = @('x86', 'x64')
 )
 
 # References:
@@ -96,7 +97,44 @@ function Configure {
         $QtBuildConfiguration = '-release'
     }
 
-    $BuildCommand = "..\..\..\qt5\configure -opensource -confirm-license ${QtBuildConfiguration} -no-strip -nomake examples -nomake tests -no-compile-examples -schannel -no-dbus -no-freetype -no-harfbuzz -no-icu -no-feature-itemmodeltester -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-testlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc -no-sql-psql -no-sql-sqlite2 -no-sql-sqlite -no-sql-tds -DQT_NO_PDF -DQT_NO_PRINTER -mp -prefix ${BuildPath}"
+    $BuildCommand = @(
+        "..\..\..\qt5\configure",
+        "-opensource",
+        "-confirm-license",
+        "${QtBuildConfiguration}",
+        "-no-strip",
+        "-nomake",
+        "examples",
+        "-nomake",
+        "tests",
+        "-no-compile-examples",
+        "-schannel",
+        "-no-dbus",
+        "-no-freetype",
+        "-no-harfbuzz",
+        "-no-icu",
+        "-no-feature-itemmodeltester",
+        "-no-feature-printdialog",
+        "-no-feature-printer",
+        "-no-feature-printpreviewdialog",
+        "-no-feature-printpreviewwidget",
+        "-no-feature-sql",
+        "-no-feature-sqlmodel",
+        "-no-feature-testlib",
+        "-no-sql-db2",
+        "-no-sql-ibase",
+        "-no-sql-mysql",
+        "-no-sql-oci",
+        "-no-sql-odbc",
+        "-no-sql-psql",
+        "-no-sql-sqlite2",
+        "-no-sql-sqlite",
+        "-no-sql-tds",
+        "-DQT_NO_PDF",
+        "-DQT_NO_PRINTER",
+        "-mp",
+        "-prefix", "${BuildPath}"
+    )
 
     $Params = @{
         BasePath = (Get-Location | Convert-Path)

diff --git a/deps.qt/qt6.ps1 b/deps.qt/qt6.ps1
@@ -40,6 +40,10 @@ function Setup {
         '--force'
     )
     Invoke-External perl init-repository @Options
+
+    if ( (${Target} -eq "arm64") -and [string]::IsNullOrWhiteSpace($script:QtHostPath) ) {
+        throw "Qt $($Version) must be installed and QtHostPath argument must be passed to cross-compile to Windows ARM64."
+    }
 }
 
 function Clean {
@@ -88,14 +92,43 @@ function Configure {
         $QtBuildConfiguration = '-release'
     }
 
-    $BuildCommand = "..\..\..\qt6\configure -opensource -confirm-license ${QtBuildConfiguration} -nomake examples -nomake tests -schannel -no-dbus -no-freetype -no-icu -no-openssl -no-feature-androiddeployqt -no-feature-pdf -no-feature-printsupport -no-feature-qmake -no-feature-sql -no-feature-testlib -no-feature-windeployqt -qt-doubleconversion -qt-pcre -qt-zlib -qt-libjpeg -qt-libpng -qt-libmd4c -qt-tiff -qt-webp -DQT_NO_PDF -DCMAKE_IGNORE_PREFIX_PATH=C:/Strawberry/c -prefix ${BuildPath}"
+    $BuildCommand = @("..\..\..\qt6\configure")
+
+    if (${Target} -eq "ARM64") {
+        $BuildCommand += @("-platform win32-msvc -xplatform win32-arm64-msvc -qt-host-path '$($script:QtHostPath)'")
+    }
+
+    $BuildCommand += @(
+        "-opensource",
+        "-confirm-license",
+        "${QtBuildConfiguration}",
+        "-nomake",
+        "examples",
+        "-nomake",
+        "tests",
+        "-schannel",
+        "-no-dbus",
+        "-no-freetype",
+        "-no-icu",
+        "-no-openssl",
+        "-no-feature-androiddeployqt",
+        "-no-feature-pdf",
+        "-no-feature-printsupport",
+        "-no-feature-qmake",
+        "-no-feature-sql",
+        "-no-feature-testlib",
+        "-no-feature-windeployqt",
+        "-DQT_NO_PDF",
+        "-prefix", "${BuildPath}"
+    )
+
 
     $Params = @{
         BasePath = (Get-Location | Convert-Path)
         BuildPath = "."
         BuildCommand = "${BuildCommand}"
         Target = $Target
-        HostArchitecture = $Target
+        HostArchitecture = ($Target, 'x64')[$Target -eq 'ARM64']
     }
 
     Invoke-DevShell @Params
@@ -112,7 +145,7 @@ function Build {
         BuildPath = "."
         BuildCommand = "cmake --build . --parallel"
         Target = $Target
-        HostArchitecture = $Target
+        HostArchitecture = ($Target, 'x64')[$Target -eq 'ARM64']
     }
 
     Invoke-DevShell @Params
@@ -131,7 +164,7 @@ function Install {
         BuildPath = "."
         BuildCommand = "${BuildCommand}"
         Target = $Target
-        HostArchitecture = $Target
+        HostArchitecture = ($Target, 'x64')[$Target -eq 'ARM64']
     }
 
     Invoke-DevShell @Params