diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-03 23:48:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 23:48:29 +0200 |
| commit | c164f02c48053d30671590aacc115b309041f10e (patch) | |
| tree | f8d1c23fa6f31d0489405ce8ac2c5e4ddbf01a8b | |
| parent | Update AudioRenderer Voice Sections (#614) (diff) | |
| parent | Add qt windowsvistastyle dll to the build (diff) | |
| download | yuzu-c164f02c48053d30671590aacc115b309041f10e.tar yuzu-c164f02c48053d30671590aacc115b309041f10e.tar.gz yuzu-c164f02c48053d30671590aacc115b309041f10e.tar.bz2 yuzu-c164f02c48053d30671590aacc115b309041f10e.tar.lz yuzu-c164f02c48053d30671590aacc115b309041f10e.tar.xz yuzu-c164f02c48053d30671590aacc115b309041f10e.tar.zst yuzu-c164f02c48053d30671590aacc115b309041f10e.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 ed24c742c..e4a9796c8 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -3,7 +3,9 @@ function(copy_yuzu_Qt5_deps target_dir) set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") + set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") set(PLATFORMS ${DLL_DEST}platforms/) + set(STYLES ${DLL_DEST}styles/) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} icudt*.dll icuin*.dll @@ -14,4 +16,5 @@ function(copy_yuzu_Qt5_deps target_dir) Qt5Widgets$<$<CONFIG:Debug>:d>.* ) windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) + windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) endfunction(copy_yuzu_Qt5_deps) diff --git a/appveyor.yml b/appveyor.yml index 72cda26a7..17d1b5fee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -116,6 +116,7 @@ after_build: mkdir $RELEASE_DIST mkdir $RELEASE_DIST/platforms + mkdir $RELEASE_DIST/styles # 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 @@ -136,6 +137,9 @@ after_build: # copy the qt windows plugin dll to platforms Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms" + # 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" + 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* 7z a $MINGW_SEVENZIP $RELEASE_DIST } |