diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-07-29 19:55:21 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-07 05:06:33 +0200 |
| commit | e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c (patch) | |
| tree | f9fdcd68ff8a2bf71bad3e63763538686d0fd8e1 | |
| parent | Use const where applicable (diff) | |
| download | yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.gz yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.bz2 yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.lz yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.xz yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.zst yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.zip | |
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 3 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index e4a9796c8..aaf80b77b 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -4,8 +4,10 @@ function(copy_yuzu_Qt5_deps target_dir) set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") + set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") set(PLATFORMS ${DLL_DEST}platforms/) set(STYLES ${DLL_DEST}styles/) + set(IMAGEFORMATS ${DLL_DEST}imageformats/) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} icudt*.dll icuin*.dll @@ -17,4 +19,5 @@ function(copy_yuzu_Qt5_deps target_dir) ) windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) + windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} qjpeg$<$<CONFIG:Debug>:d>.*) endfunction(copy_yuzu_Qt5_deps) diff --git a/appveyor.yml b/appveyor.yml index 17d1b5fee..a6f12b267 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -117,6 +117,7 @@ after_build: mkdir $RELEASE_DIST mkdir $RELEASE_DIST/platforms 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" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST @@ -140,6 +141,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 jpeg imageformat dll to platforms + Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/imageformats/qjpeg.dll" -force -destination "$RELEASE_DIST/imageformats" + 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* 7z a $MINGW_SEVENZIP $RELEASE_DIST } |