From 30e47df53db518c27f541f314d352511d6cee6b4 Mon Sep 17 00:00:00 2001 From: Howon Lee Date: Mon, 1 Jul 2024 17:30:03 +0900 Subject: [PATCH 1/2] ARM64 Support WITH_CAROTENE=ON won't work with ARM64 --- build_windows.ps1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build_windows.ps1 b/build_windows.ps1 index f0e33b1..f839e10 100644 --- a/build_windows.ps1 +++ b/build_windows.ps1 @@ -10,10 +10,17 @@ function BuildForWindows($platform, $vcpkgPath, $runMsbuild) { if ($platform -eq "x64") { $msbuildPlatform = "x64" $msmfFlag = "ON" + $caroteneFlag = "ON" + } + else if $platform -eq "arm64") { + $msbuildPlatform = "ARM64" + $msmfFlag = "ON" + $caroteneFlag = "OFF" } else { $msbuildPlatform = "Win32" $msmfFlag = "OFF" # opencv_videoio430.lib(cap_msmf.obj) : error LNK2001: unresolved external symbol _MFVideoFormat_H263 + $caroteneFlag = "ON" } cmake -G "Visual Studio 17 2022" ` @@ -46,6 +53,7 @@ function BuildForWindows($platform, $vcpkgPath, $runMsbuild) { -D WITH_QT=OFF ` -D WITH_FREETYPE=OFF ` -D WITH_TESSERACT=ON ` + -D WITH_CAROTENE=${caroteneFlag} ` -D Tesseract_INCLUDE_DIR="${vcpkgPath}/installed/${platform}-windows-static/include" ` -D Tesseract_LIBRARY="${vcpkgPath}/installed/${platform}-windows-static/lib/tesseract41.lib" ` -D Lept_LIBRARY="${vcpkgPath}/installed/${platform}-windows-static/lib/leptonica-1.81.0.lib" ` @@ -75,9 +83,10 @@ If ((Resolve-Path -Path $MyInvocation.InvocationName).ProviderPath -eq $MyInvoca $vcpkgPath = "C:\Projects\vcpkg" $platform = "x64" #$platform = "x86" + #$platform = "arm64" Invoke-Expression "${vcpkgPath}\vcpkg.exe install tesseract:${platform}-windows-static" -ErrorAction Stop #Invoke-Expression "${vcpkgPath}\vcpkg.exe integrate install" -ErrorAction Stop BuildForWindows $platform $vcpkgPath $FALSE -} \ No newline at end of file +} From 9f67f7fae22c5d86d89761fd4245a9f225eb8539 Mon Sep 17 00:00:00 2001 From: Howon Lee Date: Wed, 17 Jul 2024 17:06:32 +0900 Subject: [PATCH 2/2] Fixed typo Co-authored-by: M. Scott Ford --- build_windows.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_windows.ps1 b/build_windows.ps1 index f839e10..623d38b 100644 --- a/build_windows.ps1 +++ b/build_windows.ps1 @@ -12,7 +12,7 @@ function BuildForWindows($platform, $vcpkgPath, $runMsbuild) { $msmfFlag = "ON" $caroteneFlag = "ON" } - else if $platform -eq "arm64") { + elseif ($platform -eq "arm64") { $msbuildPlatform = "ARM64" $msmfFlag = "ON" $caroteneFlag = "OFF"