Merge pull request #1453 from atauzki/staged

A temporary workaround to #1451
xiaoyifang · Apr 1, 2024 · 04bd93e · 04bd93e
2 parents 46fc6a9 + 5f98085
commit 04bd93e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/scripts/windows-publish.ps1 b/.github/scripts/windows-publish.ps1
@@ -70,6 +70,14 @@ function Main() {
     # Copy-Item -Path $multimedia -Destination $archiveName\plugins -Recurse
     # }
 
+    $multimedia_ffmpeg_av_dll="{0}\bin\av*.dll" -f $env:QTDIR.Trim()
+    $multimedia_ffmpeg_sw_dll="{0}\bin\sw*.dll" -f $env:QTDIR.Trim()
+    if (Test-Path $multimedia_ffmpeg_av_dll && Test-Path $multimedia_ffmpeg_sw_dll) {
+        Write-Host "copy multimedia_ffmpeg_dlls $($multimedia_ffmpeg_av_dll) $($multimedia_ffmpeg_sw_dll) from qt"
+        Copy-Item -Path $multimedia_ffmpeg_av_dll -Destination $archiveName\plugins -Recurse
+        Copy-Item -Path $multimedia_ffmpeg_sw_dll -Destination $archiveName\plugins -Recurse
+    }
+
     Write-Host "compress zip..."
     # 打包zip
     Compress-Archive -Path $archiveName -DestinationPath $archiveName'.zip'

diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [ 6.6.2 ]
+        qt_ver: [ 6.6.2,6.7.0 ]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe

diff --git a/.github/workflows/windows-PR-check.yml b/.github/workflows/windows-PR-check.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [5.15.2,6.6.0]
+        qt_ver: [5.15.2,6.6.2]
         qt_arch: [win64_msvc2019_64]
     steps:
       - uses: actions/setup-python@v3

diff --git a/CMake_Win.cmake b/CMake_Win.cmake
@@ -28,7 +28,7 @@ target_link_libraries(${GOLDENDICT} PRIVATE ${THIRD_PARTY_LIBARY})
 
 # Copy .dlls to output dir
 
-file(GLOB DLL_FILES LIST_DIRECTORIES false "${CMAKE_SOURCE_DIR}/winlibs/lib/msvc/*.dll")
+file(GLOB DLL_FILES LIST_DIRECTORIES false "${CMAKE_SOURCE_DIR}/winlibs/lib/msvc/*.dll" "${Qt6_ROOT}/bin/av*.dll" "${Qt6_ROOT}/bin/sw*.dll")
 foreach (A_DLL_FILE ${DLL_FILES})
     get_filename_component(TEMP_VAR_HOLDING_DLL_FILENAME ${A_DLL_FILE} NAME)
     configure_file("${A_DLL_FILE}" "${GD_WIN_OUTPUT_DIR}/${TEMP_VAR_HOLDING_DLL_FILENAME}" COPYONLY)