From 287ee1cd631cb66732a08b811333105362fe039b Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 15 Nov 2018 20:55:37 -0800 Subject: [PATCH 1/3] 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 d15c3f6e8..6cf43a006 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh @@ -57,3 +57,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 84364c9d4f2bf77a05a6fd5064f4236e9d25ab88 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 15 Nov 2018 21:53:40 -0800 Subject: [PATCH 2/3] 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 6d0e6522a..1d5e5c556 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -125,17 +125,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/UtilityFunctions.ps1" - $DLLSearchPath = "C:\msys64\mingw64\bin;$env:PATH" - $MingwDLLs = RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\yuzu.exe" - $MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\yuzu_cmd.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" @@ -144,6 +133,18 @@ after_build: # copy the qt jpeg imageformat dll to platforms Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/imageformats/qjpeg.dll" -force -destination "$RELEASE_DIST/imageformats" + + # copy all the dll dependencies to the release folder + . "./.appveyor/UtilityFunctions.ps1" + $DLLSearchPath = "C:\msys64\mingw64\bin;$env:PATH" + $MingwDLLs = RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\yuzu.exe" + $MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\yuzu_cmd.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" + } 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* 7z a $MINGW_SEVENZIP $RELEASE_DIST From e634ce847f6682dc80cae6745a54c8d209204d7e Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 15 Nov 2018 22:44:18 -0800 Subject: [PATCH 3/3] Remove whitespace --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1d5e5c556..d6a69fbc2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -133,7 +133,7 @@ after_build: # copy the qt jpeg imageformat dll to platforms Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/imageformats/qjpeg.dll" -force -destination "$RELEASE_DIST/imageformats" - + # copy all the dll dependencies to the release folder . "./.appveyor/UtilityFunctions.ps1" $DLLSearchPath = "C:\msys64\mingw64\bin;$env:PATH"