summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-07-29 13:55:21 -0400
committerGravatar Zach Hilman2018-08-06 23:06:33 -0400
commite4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c (patch)
treef9fdcd68ff8a2bf71bad3e63763538686d0fd8e1
parentUse const where applicable (diff)
downloadyuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.gz
yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.tar.xz
yuzu-e4422b09b665101ea4e43e3ceddd9fbdbb2c9c4c.zip
Fix missing qjpeg DLL
-rw-r--r--CMakeModules/CopyYuzuQt5Deps.cmake3
-rw-r--r--appveyor.yml4
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)
4 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") 4 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
5 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") 5 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
6 set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") 6 set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/")
7 set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/")
7 set(PLATFORMS ${DLL_DEST}platforms/) 8 set(PLATFORMS ${DLL_DEST}platforms/)
8 set(STYLES ${DLL_DEST}styles/) 9 set(STYLES ${DLL_DEST}styles/)
10 set(IMAGEFORMATS ${DLL_DEST}imageformats/)
9 windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} 11 windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
10 icudt*.dll 12 icudt*.dll
11 icuin*.dll 13 icuin*.dll
@@ -17,4 +19,5 @@ function(copy_yuzu_Qt5_deps target_dir)
17 ) 19 )
18 windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) 20 windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
19 windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) 21 windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*)
22 windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} qjpeg$<$<CONFIG:Debug>:d>.*)
20endfunction(copy_yuzu_Qt5_deps) 23endfunction(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:
117 mkdir $RELEASE_DIST 117 mkdir $RELEASE_DIST
118 mkdir $RELEASE_DIST/platforms 118 mkdir $RELEASE_DIST/platforms
119 mkdir $RELEASE_DIST/styles 119 mkdir $RELEASE_DIST/styles
120 mkdir $RELEASE_DIST/imageformats
120 121
121 # copy the compiled binaries and other release files to the release folder 122 # copy the compiled binaries and other release files to the release folder
122 Get-ChildItem "$CMAKE_BINARY_DIR" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST 123 Get-ChildItem "$CMAKE_BINARY_DIR" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
@@ -140,6 +141,9 @@ after_build:
140 # copy the qt windows vista style dll to platforms 141 # copy the qt windows vista style dll to platforms
141 Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles" 142 Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles"
142 143
144 # copy the qt jpeg imageformat dll to platforms
145 Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/imageformats/qjpeg.dll" -force -destination "$RELEASE_DIST/imageformats"
146
143 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* 147 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\*
144 7z a $MINGW_SEVENZIP $RELEASE_DIST 148 7z a $MINGW_SEVENZIP $RELEASE_DIST
145 } 149 }