mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-09-12 12:27:45 +02:00
Merge pull request #613 from jroweboy/qt-style
Add qt windowsvistastyle dll to the build
This commit is contained in:
commit
c164f02c48
@ -3,7 +3,9 @@ function(copy_yuzu_Qt5_deps target_dir)
|
|||||||
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
||||||
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
|
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
|
||||||
set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
|
set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
|
||||||
|
set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/")
|
||||||
set(PLATFORMS ${DLL_DEST}platforms/)
|
set(PLATFORMS ${DLL_DEST}platforms/)
|
||||||
|
set(STYLES ${DLL_DEST}styles/)
|
||||||
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
|
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
|
||||||
icudt*.dll
|
icudt*.dll
|
||||||
icuin*.dll
|
icuin*.dll
|
||||||
@ -14,4 +16,5 @@ function(copy_yuzu_Qt5_deps target_dir)
|
|||||||
Qt5Widgets$<$<CONFIG:Debug>:d>.*
|
Qt5Widgets$<$<CONFIG:Debug>:d>.*
|
||||||
)
|
)
|
||||||
windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<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)
|
endfunction(copy_yuzu_Qt5_deps)
|
||||||
|
@ -116,6 +116,7 @@ after_build:
|
|||||||
|
|
||||||
mkdir $RELEASE_DIST
|
mkdir $RELEASE_DIST
|
||||||
mkdir $RELEASE_DIST/platforms
|
mkdir $RELEASE_DIST/platforms
|
||||||
|
mkdir $RELEASE_DIST/styles
|
||||||
|
|
||||||
# copy the compiled binaries and other release files to the release folder
|
# 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
|
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 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-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 -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\*
|
||||||
7z a $MINGW_SEVENZIP $RELEASE_DIST
|
7z a $MINGW_SEVENZIP $RELEASE_DIST
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user