mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-18 17:43:22 +02:00
Merge pull request #4440 from FearlessTobi/port-1705
Port yuzu-emu/yuzu#1705: "Include QT imageformat dependencies with releases"
This commit is contained in:
commit
9d87360c01
@ -35,3 +35,4 @@ done
|
|||||||
|
|
||||||
pip3 install pefile
|
pip3 install pefile
|
||||||
python3 .travis/linux-mingw/scan_dll.py package/*.exe "package/"
|
python3 .travis/linux-mingw/scan_dll.py package/*.exe "package/"
|
||||||
|
python3 .travis/linux-mingw/scan_dll.py package/imageformats/*.dll "package/"
|
||||||
|
23
appveyor.yml
23
appveyor.yml
@ -119,17 +119,6 @@ after_build:
|
|||||||
Copy-Item -path "$CMAKE_SOURCE_DIR/license.txt" -destination $RELEASE_DIST
|
Copy-Item -path "$CMAKE_SOURCE_DIR/license.txt" -destination $RELEASE_DIST
|
||||||
Copy-Item -path "$CMAKE_SOURCE_DIR/README.md" -destination $RELEASE_DIST
|
Copy-Item -path "$CMAKE_SOURCE_DIR/README.md" -destination $RELEASE_DIST
|
||||||
|
|
||||||
# copy all the dll dependencies to the release folder
|
|
||||||
. "./.appveyor/FindDependencies.ps1"
|
|
||||||
$DLLSearchPath = "C:\msys64\mingw64\bin;$env:PATH"
|
|
||||||
$MingwDLLs = RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\citra.exe"
|
|
||||||
$MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\citra-qt.exe"
|
|
||||||
Write-Host "Detected the following dependencies:"
|
|
||||||
Write-Host $MingwDLLs
|
|
||||||
foreach ($file in $MingwDLLs) {
|
|
||||||
Copy-Item -path "$file" -force -destination "$RELEASE_DIST"
|
|
||||||
}
|
|
||||||
|
|
||||||
# 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"
|
||||||
|
|
||||||
@ -142,6 +131,18 @@ after_build:
|
|||||||
# copy the qt imageformats plugin dlls to imageformats
|
# copy the qt imageformats plugin dlls to imageformats
|
||||||
Get-ChildItem "C:/msys64/mingw64/share/qt5/plugins/imageformats" -Exclude "*d.dll" | Copy-Item -force -destination "$RELEASE_DIST/imageformats"
|
Get-ChildItem "C:/msys64/mingw64/share/qt5/plugins/imageformats" -Exclude "*d.dll" | Copy-Item -force -destination "$RELEASE_DIST/imageformats"
|
||||||
|
|
||||||
|
# copy all the dll dependencies to the release folder
|
||||||
|
. "./.appveyor/FindDependencies.ps1"
|
||||||
|
$DLLSearchPath = "C:\msys64\mingw64\bin;$env:PATH"
|
||||||
|
$MingwDLLs = RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\citra.exe"
|
||||||
|
$MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\citra-qt.exe"
|
||||||
|
$MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\imageformats\qjpeg.dll"
|
||||||
|
Write-Host "Detected the following dependencies:"
|
||||||
|
Write-Host $MingwDLLs
|
||||||
|
foreach ($file in $MingwDLLs) {
|
||||||
|
Copy-Item -path "$file" -force -destination "$RELEASE_DIST"
|
||||||
|
}
|
||||||
|
|
||||||
# process PDBs
|
# process PDBs
|
||||||
. "./.appveyor/ProcessPdb.ps1"
|
. "./.appveyor/ProcessPdb.ps1"
|
||||||
7z a -tzip $MINGW_BUILD_PDB $RELEASE_DIST\*.pdb
|
7z a -tzip $MINGW_BUILD_PDB $RELEASE_DIST\*.pdb
|
||||||
|
Loading…
Reference in New Issue
Block a user