From afeaaa91cb308c8fc1ef0b24b80852a38bfbe4ff Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 15 Nov 2018 20:55:37 -0800 Subject: [PATCH 1/2] Include imageformat dependencies with releases --- .travis/linux-mingw/docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/linux-mingw/docker.sh b/.travis/linux-mingw/docker.sh index edbaaae50..949e5e093 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh @@ -35,3 +35,4 @@ done pip3 install pefile python3 .travis/linux-mingw/scan_dll.py package/*.exe "package/" +python3 .travis/linux-mingw/scan_dll.py package/imageformats/*.dll "package/" From 7947c81eaa85fcd6880da255383b6c86e714ecd8 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 15 Nov 2018 21:53:40 -0800 Subject: [PATCH 2/2] Include imageformat dependencies with releases (appveyor) --- appveyor.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 049fd9845..3e4299250 100644 --- a/appveyor.yml +++ b/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/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-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 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 . "./.appveyor/ProcessPdb.ps1" 7z a -tzip $MINGW_BUILD_PDB $RELEASE_DIST\*.pdb