Browse Source
Merge pull request #613 from jroweboy/qt-style
Add qt windowsvistastyle dll to the build
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
0 deletions
-
CMakeModules/CopyYuzuQt5Deps.cmake
-
appveyor.yml
|
|
|
@ -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) |
|
|
|
@ -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 |
|
|
|
} |
|
|
|
|