From c52e0cdfa82019807bca976aab2667d48c2864db Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Thu, 28 Jun 2018 22:53:23 +0800 Subject: [PATCH] CI: add imageformats plugins --- CMakeModules/CopyCitraQt5Deps.cmake | 13 +++++++++++++ appveyor.yml | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/CMakeModules/CopyCitraQt5Deps.cmake b/CMakeModules/CopyCitraQt5Deps.cmake index fcbf174ee7..88f9b8af1c 100644 --- a/CMakeModules/CopyCitraQt5Deps.cmake +++ b/CMakeModules/CopyCitraQt5Deps.cmake @@ -5,9 +5,11 @@ function(copy_citra_Qt5_deps target_dir) set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/") set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") + set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") set(PLATFORMS ${DLL_DEST}platforms/) set(MEDIASERVICE ${DLL_DEST}mediaservice/) set(STYLES ${DLL_DEST}styles/) + set(IMAGEFORMATS ${DLL_DEST}imageformats/) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} icudt*.dll icuin*.dll @@ -25,4 +27,15 @@ function(copy_citra_Qt5_deps target_dir) wmfengine$<$:d>.* ) windows_copy_files(citra-qt ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$:d>.*) + windows_copy_files(${target_dir} ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} + qgif$<$:d>.dll + qicns$<$:d>.dll + qico$<$:d>.dll + qjpeg$<$:d>.dll + qsvg$<$:d>.dll + qtga$<$:d>.dll + qtiff$<$:d>.dll + qwbmp$<$:d>.dll + qwebp$<$:d>.dll + ) endfunction(copy_citra_Qt5_deps) diff --git a/appveyor.yml b/appveyor.yml index 772635267a..be19928236 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -113,6 +113,7 @@ after_build: mkdir $RELEASE_DIST/platforms mkdir $RELEASE_DIST/mediaservice mkdir $RELEASE_DIST/styles + mkdir $RELEASE_DIST/imageformats # copy the compiled binaries and other release files to the release folder Get-ChildItem "$CMAKE_BINARY_DIR" -Recurse -Filter "citra*.exe" | Copy-Item -destination $RELEASE_DIST @@ -139,6 +140,9 @@ after_build: # copy the qt windows vista style dll to platforms Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles" + # copy the qt imageformats plugin dlls to imageformats + Get-ChildItem "C:/msys64/mingw64/share/qt5/plugins/imageformats" -Exclude "*d.dll" | Copy-Item -force -destination "$RELEASE_DIST/imageformats" + # process PDBs . "./.appveyor/ProcessPdb.ps1" 7z a -tzip $MINGW_BUILD_PDB $RELEASE_DIST\*.pdb